Skip to content
Snippets Groups Projects
Commit 7fe45501 authored by Alexander Schlemmer's avatar Alexander Schlemmer
Browse files

FIX: corrected unresolved merge in makefile

parent c5a196f0
No related branches found
No related tags found
No related merge requests found
...@@ -21,13 +21,11 @@ ...@@ -21,13 +21,11 @@
# ** end header # ** end header
# #
<<<<<<< HEAD SHELL:=/bin/bash
runserver: runserver:
mvn exec:exec mvn exec:exec
=======
SHELL:=/bin/bash
>>>>>>> 619a505b48586e03fd34f65da12d6ff1b32138c6
run: compile run: compile
mvn exec:exec mvn exec:exec
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment