summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2018-01-10 20:27:51 -0200
committerStan Hu <stanhu@gmail.com>2018-01-16 17:05:10 -0800
commitde3b9b9fb508636c527bbb1de33614dcfdf80e6e (patch)
tree3a855e3c9b60fd4b79d98400b2cc7ac97f924d9c
parent450cb59cdd648b6657a6474d1699cd88de2150da (diff)
downloadgitlab-ce-de3b9b9fb508636c527bbb1de33614dcfdf80e6e.tar.gz
Update VERSION to 10.3.4
-rw-r--r--VERSION4
1 files changed, 4 insertions, 0 deletions
diff --git a/VERSION b/VERSION
index 80959b81ba4..cd5aa407ba8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1,5 @@
+<<<<<<< HEAD
10.4.0-pre
+=======
+10.3.4
+>>>>>>> Update VERSION to 10.3.4