summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--doc/version.texi9
2 files changed, 1 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index e589557..d70b606 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ tags
GPATH
GRTAGS
GTAGS
+/doc/version.texi
diff --git a/doc/version.texi b/doc/version.texi
deleted file mode 100644
index e2494e1..0000000
--- a/doc/version.texi
+++ /dev/null
@@ -1,9 +0,0 @@
-@set UPDATED 9 October 2016
-@set UPDATED-MONTH October 2016
-<<<<<<< Updated upstream
-@set EDITION 0.10.1
-@set VERSION 0.10.1
-=======
-@set EDITION 0.10.0
-@set VERSION 0.10.0
->>>>>>> Stashed changes