v1.3.0 fixes

gocodebox · Aug 28, 2015 · e98a4b6 · e98a4b6
1 parent 702690c
commit e98a4b6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/lifterlms.php b/lifterlms.php
@@ -31,11 +31,7 @@
  */
 final class LifterLMS {
 
-<<<<<<< HEAD
-	public $version = '1.2.8';
-=======
 	public $version = '1.3.0';
->>>>>>> origin/develop
 
 	protected static $_instance = null;