Fix last merge conflict

Author: Michael Vasseur

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)