From 78c5b45539b03bc29476da9cfe7bae6f06ca36cd Mon Sep 17 00:00:00 2001
From: LinuxMint4Ever <>
Date: Sat, 8 Feb 2020 00:36:50 +0100
Subject: [PATCH] git doing funny things

---
 deployment-script.sh              | 3 ++-
 deployment-script_BACKUP_19041.sh | 6 ------
 deployment-script_BASE_19041.sh   | 0
 deployment-script_LOCAL_19041.sh  | 1 -
 deployment-script_REMOTE_19041.sh | 2 --
 5 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 deployment-script_BACKUP_19041.sh
 delete mode 100644 deployment-script_BASE_19041.sh
 delete mode 100644 deployment-script_LOCAL_19041.sh
 delete mode 100644 deployment-script_REMOTE_19041.sh

diff --git a/deployment-script.sh b/deployment-script.sh
index cc1f786..15ae026 100644
--- a/deployment-script.sh
+++ b/deployment-script.sh
@@ -1 +1,2 @@
-#!/bin/bash
\ No newline at end of file
+#!/bin/bash
+#do nothing for now.
diff --git a/deployment-script_BACKUP_19041.sh b/deployment-script_BACKUP_19041.sh
deleted file mode 100644
index 417392a..0000000
--- a/deployment-script_BACKUP_19041.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-<<<<<<< HEAD
-#!/bin/bash
-=======
-#!/bin/bash
-# Do nothing for now.
->>>>>>> jan
diff --git a/deployment-script_BASE_19041.sh b/deployment-script_BASE_19041.sh
deleted file mode 100644
index e69de29..0000000
diff --git a/deployment-script_LOCAL_19041.sh b/deployment-script_LOCAL_19041.sh
deleted file mode 100644
index cc1f786..0000000
--- a/deployment-script_LOCAL_19041.sh
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/bash
\ No newline at end of file
diff --git a/deployment-script_REMOTE_19041.sh b/deployment-script_REMOTE_19041.sh
deleted file mode 100644
index 2ebc739..0000000
--- a/deployment-script_REMOTE_19041.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-# Do nothing for now.
\ No newline at end of file