Update for change in ocd git script

2020-02-24 15:04:59 -05:00 · 2020-02-24 15:04:59 -05:00 · 72ed78e55a
parent 59bb8a89c0
commit 72ed78e55a
1 changed files with 0 additions and 4 deletions
--- a/4
+++ b/4
@ -1,5 +1 @@
-<<<<<<< HEAD
-1.5.138
-=======
 1.5.139
->>>>>>> master