add fixes

2018-08-11 20:34:19 +02:00 · 2018-08-11 20:34:19 +02:00 · 3b7c0d54b2
commit 3b7c0d54b2
parent 45f87ca66a
6 changed files with 13 additions and 1 deletions
--- a/effects/Vignette-1.sh
+++ b/effects/Vignette-1.sh
@ -1,3 +1,7 @@
 #!/bin/bash
+<<<<<<< HEAD
+composite -gravity center -resize 1251x1039 /home/pi/effects/grad_vignette_1.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
+=======
 composite -gravity center -resize 3908x2602 grad_vignette_1.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
+>>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690

--- a/effects/Vignette-2.sh
+++ b/effects/Vignette-2.sh
@ -1,2 +1,6 @@
 #!/bin/bash
+<<<<<<< HEAD
+composite -gravity center -resize 1251x1039 /home/pi/effects/grad_vignette_2.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
+=======
 composite -gravity center -resize 3908x2602 grad_vignette_2.png /home/pi/cam.jpg /home/pi/DCIM/$(x="$(ls -v /home/pi/DCIM/| tail -n 1 | sed 's/.jpg//g')"; echo $x | awk '{printf $1 + 1}').jpg
+>>>>>>> 45f87ca66a1f5f1055aadf6095918a1859c3e690
--- a/effects/grad_vignette_1.png
+++ b/effects/grad_vignette_1.png
--- a/effects/grad_vignette_2.png
+++ b/effects/grad_vignette_2.png