git doing funny things

2020-02-08 00:36:50 +01:00 · 2020-02-08 00:36:50 +01:00 · 78c5b45539
parent b7b6d6c1ad
commit 78c5b45539
5 changed files with 2 additions and 10 deletions
--- a/deployment-script.sh
+++ b/deployment-script.sh
@ -1 +1,2 @@
 #!/bin/bash
+#do nothing for now.
--- a/deployment-script_BACKUP_19041.sh
+++ b/deployment-script_BACKUP_19041.sh
@ -1,6 +0,0 @@
-<<<<<<< HEAD
-#!/bin/bash
-=======
-#!/bin/bash
-# Do nothing for now.
->>>>>>> jan
--- a/deployment-script_BASE_19041.sh
+++ b/deployment-script_BASE_19041.sh
--- a/deployment-script_LOCAL_19041.sh
+++ b/deployment-script_LOCAL_19041.sh
@ -1 +0,0 @@
-#!/bin/bash
--- a/deployment-script_REMOTE_19041.sh
+++ b/deployment-script_REMOTE_19041.sh
@ -1,2 +0,0 @@
-#!/bin/bash
-# Do nothing for now.