prepare merge

2015-04-20 11:19:48 +02:00 · 2015-04-20 11:19:48 +02:00 · 88f1a3fc15
commit 88f1a3fc15
parent e4b2e154f5
16 changed files with 0 additions and 37 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,17 +0,0 @@
 dist
 cabal-dev
 *.o
 *.hi
 *.chi
 *.chs.h
 *.dyn_o
 *.dyn_hi
 .virtualenv
 .hpc
 .hsenv
 .cabal-sandbox/
 cabal.sandbox.config
 cabal.config
 *.prof
 *.aux
 *.hp
--- a/.travis.yml
+++ b/.travis.yml
@ -1,20 +0,0 @@
 language: haskell
 ghc:
  - 7.8
 before_install:
  - git clone https://github.com/haskell-servant/servant.git
  - cabal sandbox init
  - cabal sandbox add-source servant/
 notifications:
  irc:
    channels:
      - "irc.freenode.org#servant"
    template:
      - "%{repository}#%{build_number} - %{commit} on %{branch} by %{author}: %{message}"
      - "Build details: %{build_url} - Change view: %{compare_url}"
    skip_join: true
    on_success: change
    on_failure: always
--- a/servant-docs/CHANGELOG.md
+++ b/servant-docs/CHANGELOG.md
--- a/servant-docs/LICENSE
+++ b/servant-docs/LICENSE
--- a/servant-docs/README.md
+++ b/servant-docs/README.md
--- a/servant-docs/Setup.hs
+++ b/servant-docs/Setup.hs
--- a/servant-docs/default.nix
+++ b/servant-docs/default.nix
--- a/servant-docs/docs.sh
+++ b/servant-docs/docs.sh
--- a/servant-docs/example/greet.hs
+++ b/servant-docs/example/greet.hs
--- a/servant-docs/example/greet.md
+++ b/servant-docs/example/greet.md
--- a/servant-docs/servant-docs.cabal
+++ b/servant-docs/servant-docs.cabal
--- a/servant-docs/shell.nix
+++ b/servant-docs/shell.nix
--- a/servant-docs/src/Servant/Docs.hs
+++ b/servant-docs/src/Servant/Docs.hs
--- a/servant-docs/src/Servant/Docs/Internal.hs
+++ b/servant-docs/src/Servant/Docs/Internal.hs
--- a/servant-docs/test/Servant/DocsSpec.hs
+++ b/servant-docs/test/Servant/DocsSpec.hs
--- a/servant-docs/test/Spec.hs
+++ b/servant-docs/test/Spec.hs