Merge Mend

baykovr · Dec 18, 2014 · 83264f4 · 83264f4
1 parent fce07de
commit 83264f4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/GAVPI/GAVPI/frmGAVPI.cs b/GAVPI/GAVPI/frmGAVPI.cs
@@ -13,12 +13,8 @@ namespace GAVPI
 {
     public partial class frmGAVPI : Form
     {
-<<<<<<< HEAD
         string BUILD_VERSION = "GAVPI Alpha Build 0.03 08.10.14";
-=======
->>>>>>> 1511174d529fa5f688ceb5fce0cacfa8afb11ada
 
-        string BUILD_VERSION = "GAVPI Test Build 0.02 08.06.14";
 
         public frmGAVPI()
         {