From 4fd67d60c949d9250c1012a2c0c3e6a72439776c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20B=C3=A1nffy?= <rbanffy@gmail.com>
Date: Sat, 11 Feb 2017 19:07:10 +0000
Subject: [PATCH] Version bump, remove conflict markers

---
 selectric-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/selectric-mode.el b/selectric-mode.el
index 6e49eae..9cd0d8c 100644
--- a/selectric-mode.el
+++ b/selectric-mode.el
@@ -4,7 +4,7 @@
 ;; Maintainer: Ricardo Banffy <rbanffy@gmail.com>
 ;; URL: https://github.com/rbanffy/green-screen-emacs
 ;; Keywords: multimedia, convenience, typewriter, selectric
-;; Version: 1.3
+;; Version: 1.3.1
 
 ;; Copyright (C) 2015-2017  Ricardo Bánffy