From 7b2a22394f27e8d2034003617e60dc462490b969 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Tue, 26 May 2020 11:24:41 +0200
Subject: [PATCH] no-jira: remove merge conflict

---
 src/main/resources/serviceconfig/olat.properties | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 47f671e517e..31b599fd30e 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -1288,13 +1288,8 @@ ldap.learningResourceManagerRoleValue=
 # Build properties
 #####
 application.name=OpenOlat
-<<<<<<< HEAD
 build.version=15.1a
 build.identifier=openolat151a-dev
-=======
-build.version=15.0.1
-build.identifier=openolat1501-dev
->>>>>>> refs/heads/OpenOLAT_15.0
 build.repo.revision=local-devel
 
 #####
-- 
GitLab