Merge branch 'develop'

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