Fix last merge conflict

DOMjudge · Oct 27, 2024 · f123fa2 · f123fa2
1 parent 2aa9d30
commit f123fa2
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/webapp/Makefile b/webapp/Makefile
@@ -90,12 +90,4 @@ maintainer-clean-l:
 		done ; \
 	done
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-.PHONY: composer-dump-autoload-dev
-=======
 .PHONY: composer-dump-autoload composer-dump-autoload-dev
->>>>>>> bfa038410 (Remove first phony target)
-=======
-.PHONY: composer-dump-autoload-dev
->>>>>>> 4dd45d9cc (Replace phony copy-bundle-assets target by a real one)