resolved the merge conflict
all: package
-<<<<<<< HEAD
-.PHONY: all
-.PHONY: clean
-.PHONY: package
-
-LADSOURCES = \
-=======
SOURCES = \
->>>>>>> b5fe884410782544f86dbef55d790fee6f7a12b1
dsc.py \
test \
HandlerManifest.json \
@@ -19,12 +11,6 @@ SOURCES = \
clean:
rm -rf output
-<<<<<<< HEAD
-package: $(LADSOURCES)
- mkdir -p output
- cp -t output -r $(LADSOURCES)
- zip -r DSC.zip output/* > /dev/null
-=======
package: $(SOURCES)
mkdir -p output
cp -t output -r $(SOURCES)
@@ -33,4 +19,3 @@ package: $(SOURCES)
.PHONY: all clean package
->>>>>>> b5fe884410782544f86dbef55d790fee6f7a12b1
