Resolve merge

bigchaindb · Dec 18, 2017 · c169eb5 · c169eb5
1 parent 1076d2d
commit c169eb5
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/docs/Makefile b/docs/Makefile
@@ -26,19 +26,7 @@ html:
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
-<<<<<<< dfe221031eab9e09c54fb4c8bf0feb54fd250043
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-=======
-=======
->>>>>>> Added make hmtl and clean to Makefile
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-<<<<<<< dfe221031eab9e09c54fb4c8bf0feb54fd250043
->>>>>>> Moved docs from personal repo to official js Driver repo
-=======
->>>>>>> Added make hmtl and clean to Makefile