Merge branch 'master_in_dev' into master

openvstorage · Mar 23, 2017 · 254a4e3 · 254a4e3
2 parents c3f6b2a + 0a9f23f
commit 254a4e3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,5 @@
 syntax: regexp
 \._.*
 .orig$
-=======
 ci/api_lib/*
 .iml
diff --git a/packaging/settings.json b/packaging/settings.json
@@ -5,6 +5,6 @@
     "source_contents": "--transform 's,^,{0}-{1}/,' ci *.txt",
     "version": {
         "major": 3,
-        "minor": 0
+        "minor": 1
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,5 @@ @@
     syntax: regexp
     \._.*
     .orig$
-    =======
     ci/api_lib/*
     .iml