Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

[lilypond.git] / make / doclang-rules.make

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index 0b8f359f9c86d541776aa849f57eca49797db2e4..52e46843914817360ab988da8c239faa904bea30 100644 (file)
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:make/doclang-rules.make
 $(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.itexi
        mkdir -p $(dir $@)
        $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<