Remove first phony target

Author: Michael Vasseur

webapp/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/Makefile.global
 # Subdirectories to recurse into for REC_TARGETS
 SUBDIRS = config
 
-domserver: composer-dump-autoload
+domserver: composer-dump-autoload public/bundles/nelmioapidoc
 
 # Install PHP dependencies
 composer-dependencies:
@@ -90,4 +90,8 @@ maintainer-clean-l:
 		done ; \
 	done
 
+<<<<<<< HEAD
 .PHONY: composer-dump-autoload-dev
+=======
+.PHONY: composer-dump-autoload composer-dump-autoload-dev
+>>>>>>> bfa038410 (Remove first phony target)