fixed version number conflict

ccoolbaugh · Nov 19, 2015 · 013e974 · 013e974
1 parent 57d3282
commit 013e974
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/SourceCode/FloWaveUS.m b/SourceCode/FloWaveUS.m
@@ -14,11 +14,7 @@
 % Default Ultrasound Equipment: GE Logiq Book e
 % Default Video Equipment: Sony Multi-Functional DVD Recorder (VRD-MC6)
 %
-<<<<<<< HEAD
 % version: 0.1.1
-=======
-% version: 0.1.0
->>>>>>> master
 %
 % Crystal Coolbaugh
 % July 30, 2015