Skip to content

Commit

Permalink
Resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin-Rehr committed Aug 2, 2024
1 parent 4b22b5d commit 568791d
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ services:
endef
export DOCKER_COMPOSE_SHARED_HEADER


all: init dockerbuild

init: initbuild initdirs initcomposevars
Expand Down

0 comments on commit 568791d

Please sign in to comment.