From 004db0c9e2e0cc23f1a8743cc798224a302217ec Mon Sep 17 00:00:00 2001
From: Thorsten Sommer <mail@tsommer.org>
Date: Sat, 15 Sep 2018 13:31:19 +0000
Subject: [PATCH] Merge

---
 .gitattributes     | 1 +
 version/Version.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..dafc81f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.idea/** merge=ignore
\ No newline at end of file
diff --git a/version/Version.go b/version/Version.go
index c6fbd63..61ddd57 100644
--- a/version/Version.go
+++ b/version/Version.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-const VERSION = "1.0.2"
+const VERSION = "1.0.5"
 
 func GetGoVersion() (ver string) {
 	ver = runtime.Version()