From 72ed78e55a002e2ea905d231dd11e5d41d815c4e Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Mon, 24 Feb 2020 15:04:59 -0500
Subject: [PATCH] Update for change in ocd git script

---
 VERSION | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/VERSION b/VERSION
index 4366851..66f274e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1.5.138
-=======
 1.5.139
->>>>>>> master