Skip to content
Snippets Groups Projects
Commit 7b2a2239 authored by srosse's avatar srosse
Browse files

no-jira: remove merge conflict

parent 4ada15af
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/resources/serviceconfig/olat.properties
+ 0
− 5
View file @ 7b2a2239
......@@ -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
#####
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment