fixed merge marker

Martin Klang · Martin Klang · commit 3c32e337dcb3 · 2021-02-01T18:30:42.000+01:00
diff --git a/web.mk b/web.mk
@@ -69,7 +69,6 @@ EMCCFLAGS += -s ASSERTIONS=1
 endif
 
 PHONY: libs web minify
->>>>>>> develop
 
 # JavaScript minifiers
 #CLOSURE = java -jar Tools/node_modules/google-closure-compiler/compiler.jar --language_in=ECMASCRIPT5
