Merge pull request #199 from ocsigen/remove-merlin

Remove merlin since it is generated automatically by Dune

Author: vouillon

.gitignore

@@ -1,21 +1,11 @@
 *~
 Makefile.config
-src/.merlin
 src/baselib/dynlink_wrapper.ml
 src/baselib/ocsigen_config_static.ml
-src/baselib/.merlin
-src/baselib/polytables/.merlin
-src/http/.merlin
-src/server/.merlin
 src/extensions/ocsipersist.mli
-src/extensions/.merlin
 src/extensions/ocsipersist-dbm/ocsipersist.mli
-src/extensions/ocsipersist-dbm/.merlin
 src/extensions/ocsipersist-sqlite/ocsipersist.mli
-src/extensions/ocsipersist-sqlite/.merlin
 src/extensions/ocsipersist-pgsql/ocsipersist.mli
-src/extensions/ocsipersist-pgsql/.merlin
-src/extensions/deflatemod/.merlin
 ocsigenserver.conf.sample
 ocsigenserver.conf.opt.sample
 local