From af86eb7f8057d45680e2cd975de23dbe11adfbc1 Mon Sep 17 00:00:00 2001
From: michielmulders <michielmulders1@gmail.com>
Date: Thu, 10 Aug 2017 17:42:05 +0200
Subject: [PATCH] Added make hmtl and clean to Makefile

---
 docs/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/Makefile b/docs/Makefile
index 2ddf228..f680f98 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -14,7 +14,6 @@ help:
 
 .PHONY: help Makefile
 
-<<<<<<< 6416718102ec9ad956a1e44936afc96350e09601
 .PHONY: clean
 clean:
 	rm -rf $(BUILDDIR)/*
@@ -27,13 +26,19 @@ 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