more github trouble cleanups

dev-jam · Jan 31, 2017 · 6e7d4ac · 6e7d4ac
1 parent ecdf6c3
commit 6e7d4ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/parallel_port_trigger/parallel_port_trigger.py b/parallel_port_trigger/parallel_port_trigger.py
@@ -3,11 +3,7 @@
 """
 31-01-2017
 Author: Bob Rosbag
-<<<<<<< HEAD
 Version: 6.0
-=======
-Version: 5.0
->>>>>>> 9f7131dd090469c1b159ccc7fd89f9b0fcab1f22
 
 This file is part of OpenSesame.
 
@@ -36,7 +32,7 @@
 from libopensesame.exceptions import osexception
 from openexp.keyboard import keyboard
 
-VERSION = u'5.0'
+VERSION = u'6.0'
 
 class parallel_port_trigger(item):
 

diff --git a/parallel_port_trigger_init/parallel_port_trigger_init.py b/parallel_port_trigger_init/parallel_port_trigger_init.py
@@ -3,11 +3,7 @@
 """
 31-01-2017
 Author: Bob Rosbag
-<<<<<<< HEAD
 Version: 6.0
-=======
-Version: 5.0
->>>>>>> 9f7131dd090469c1b159ccc7fd89f9b0fcab1f22
 
 This file is part of OpenSesame.
 
@@ -35,7 +31,7 @@
 from libqtopensesame.items.qtautoplugin import qtautoplugin
 from libopensesame.exceptions import osexception
 
-VERSION = u'5.0'
+VERSION = u'6.0'
 
 class parallel_port_trigger_init(item):