Merge branch 'develop'

rbanffy · Feb 11, 2017 · e60703d · e60703d
2 parents e9913a1 + 4fd67d6
commit e60703d
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/selectric-mode.el b/selectric-mode.el
@@ -4,11 +4,7 @@
 ;; Maintainer: Ricardo Banffy <rbanffy@gmail.com>
 ;; URL: https://github.com/rbanffy/green-screen-emacs
 ;; Keywords: multimedia, convenience, typewriter, selectric
-<<<<<<< HEAD
-;; Version: 1.1.0
-=======
-;; Version: 1.3
->>>>>>> develop
+;; Version: 1.3.1
 
 ;; Copyright (C) 2015-2017 Ricardo Bánffy