From f123fa2315c5cbdfc8167a689ba0ef833d82c739 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <michael.vasseur@vu.nl>
Date: Sun, 27 Oct 2024 15:30:46 +0100
Subject: [PATCH] Fix last merge conflict

---
 webapp/Makefile | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/webapp/Makefile b/webapp/Makefile
index 5bd4cb8909..b1d4edb329 100644
--- 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)