From 247b6646542aa6bd7ae8883f6c65bb3e0f0aeea8 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sat, 30 Apr 2016 15:17:23 +0900
Subject: [PATCH] Ready for 4.0 release

---
 build.sbt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index dcbe8969f..478dd8c50 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,10 +1,6 @@
 val Organization = "gitbucket"
 val Name = "gitbucket"
-<<<<<<< HEAD
-val GitBucketVersion = "4.0.0-SNAPSHOT"
-=======
-val GitBucketVersion = "3.14.0"
->>>>>>> master
+val GitBucketVersion = "4.0.0"
 val ScalatraVersion = "2.4.0"
 val JettyVersion = "9.3.6.v20151106"