From 88f1a3fc15dd28d4936aef862813ae748af54e95 Mon Sep 17 00:00:00 2001
From: "Julian K. Arni" <jkarni@gmail.com>
Date: Mon, 20 Apr 2015 11:19:48 +0200
Subject: [PATCH] prepare merge

---
 .gitignore                                    | 17 ----------------
 .travis.yml                                   | 20 -------------------
 CHANGELOG.md => servant-docs/CHANGELOG.md     |  0
 LICENSE => servant-docs/LICENSE               |  0
 README.md => servant-docs/README.md           |  0
 Setup.hs => servant-docs/Setup.hs             |  0
 default.nix => servant-docs/default.nix       |  0
 docs.sh => servant-docs/docs.sh               |  0
 {example => servant-docs/example}/greet.hs    |  0
 {example => servant-docs/example}/greet.md    |  0
 .../servant-docs.cabal                        |  0
 shell.nix => servant-docs/shell.nix           |  0
 {src => servant-docs/src}/Servant/Docs.hs     |  0
 .../src}/Servant/Docs/Internal.hs             |  0
 .../test}/Servant/DocsSpec.hs                 |  0
 {test => servant-docs/test}/Spec.hs           |  0
 16 files changed, 37 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 .travis.yml
 rename CHANGELOG.md => servant-docs/CHANGELOG.md (100%)
 rename LICENSE => servant-docs/LICENSE (100%)
 rename README.md => servant-docs/README.md (100%)
 rename Setup.hs => servant-docs/Setup.hs (100%)
 rename default.nix => servant-docs/default.nix (100%)
 rename docs.sh => servant-docs/docs.sh (100%)
 rename {example => servant-docs/example}/greet.hs (100%)
 rename {example => servant-docs/example}/greet.md (100%)
 rename servant-docs.cabal => servant-docs/servant-docs.cabal (100%)
 rename shell.nix => servant-docs/shell.nix (100%)
 rename {src => servant-docs/src}/Servant/Docs.hs (100%)
 rename {src => servant-docs/src}/Servant/Docs/Internal.hs (100%)
 rename {test => servant-docs/test}/Servant/DocsSpec.hs (100%)
 rename {test => servant-docs/test}/Spec.hs (100%)

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0855a79b..00000000
--- a/.gitignore
+++ /dev/null
@@ -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
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 41be6fa3..00000000
--- a/.travis.yml
+++ /dev/null
@@ -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
diff --git a/CHANGELOG.md b/servant-docs/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to servant-docs/CHANGELOG.md
diff --git a/LICENSE b/servant-docs/LICENSE
similarity index 100%
rename from LICENSE
rename to servant-docs/LICENSE
diff --git a/README.md b/servant-docs/README.md
similarity index 100%
rename from README.md
rename to servant-docs/README.md
diff --git a/Setup.hs b/servant-docs/Setup.hs
similarity index 100%
rename from Setup.hs
rename to servant-docs/Setup.hs
diff --git a/default.nix b/servant-docs/default.nix
similarity index 100%
rename from default.nix
rename to servant-docs/default.nix
diff --git a/docs.sh b/servant-docs/docs.sh
similarity index 100%
rename from docs.sh
rename to servant-docs/docs.sh
diff --git a/example/greet.hs b/servant-docs/example/greet.hs
similarity index 100%
rename from example/greet.hs
rename to servant-docs/example/greet.hs
diff --git a/example/greet.md b/servant-docs/example/greet.md
similarity index 100%
rename from example/greet.md
rename to servant-docs/example/greet.md
diff --git a/servant-docs.cabal b/servant-docs/servant-docs.cabal
similarity index 100%
rename from servant-docs.cabal
rename to servant-docs/servant-docs.cabal
diff --git a/shell.nix b/servant-docs/shell.nix
similarity index 100%
rename from shell.nix
rename to servant-docs/shell.nix
diff --git a/src/Servant/Docs.hs b/servant-docs/src/Servant/Docs.hs
similarity index 100%
rename from src/Servant/Docs.hs
rename to servant-docs/src/Servant/Docs.hs
diff --git a/src/Servant/Docs/Internal.hs b/servant-docs/src/Servant/Docs/Internal.hs
similarity index 100%
rename from src/Servant/Docs/Internal.hs
rename to servant-docs/src/Servant/Docs/Internal.hs
diff --git a/test/Servant/DocsSpec.hs b/servant-docs/test/Servant/DocsSpec.hs
similarity index 100%
rename from test/Servant/DocsSpec.hs
rename to servant-docs/test/Servant/DocsSpec.hs
diff --git a/test/Spec.hs b/servant-docs/test/Spec.hs
similarity index 100%
rename from test/Spec.hs
rename to servant-docs/test/Spec.hs