env conflix fix for rpi release

EpistasisLab · Dec 8, 2022 · c03b9b4 · c03b9b4
1 parent 6527616
commit c03b9b4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.env b/.env
@@ -1,7 +1,3 @@
 #!/bin/sh
 # Docker production build environment
-<<<<<<< HEAD
 TAG=rpi-0.19
-=======
-TAG=0.19
->>>>>>> af7b5c48b694d388c1ea00fb203e036818f7dd02