Resolve merge
This commit is contained in:
parent
1076d2d2ab
commit
c169eb5d48
|
@ -26,19 +26,7 @@ html:
|
||||||
@echo
|
@echo
|
||||||
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
|
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
|
||||||
|
|
||||||
<<<<<<< dfe221031eab9e09c54fb4c8bf0feb54fd250043
|
|
||||||
# Catch-all target: route all unknown targets to Sphinx using the new
|
# Catch-all target: route all unknown targets to Sphinx using the new
|
||||||
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
|
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
|
||||||
%: Makefile
|
%: Makefile
|
||||||
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
|
@$(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
|
|
||||||
|
|
Loading…
Reference in New Issue