mongodb · pvorb · Feb 8, 2012 · Feb 8, 2012 · Feb 8, 2012 · Feb 8, 2012
diff --git a/.buildinfo b/.buildinfo
@@ -0,0 +1,4 @@
+# Sphinx build info version 1
+# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
+config: d4a1ef2e8fee8941792720296198c690
+tags: fbb0d17656682115ca4d033fb2f83ba1
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,10 @@
 *.seed
 .project
 .settings
+<<<<<<< HEAD
+=======
 data
 node_modules/
 output
 build
+>>>>>>> efddd763a3fd570178896ad748101797f10ec5b8
diff --git a/docs/sphinx-docs/source/static/.mongodb → .nojekyll b/docs/sphinx-docs/source/static/.mongodb → .nojekyll
diff --git a/.npmignore b/.npmignore
diff --git a/Makefile b/Makefile