Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-27 17:00:50 +01:00
Code Issues Packages Projects Releases Activity

fix merge issue

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-12-13 16:28:02 +01:00
parent 4b42e6e331
commit 6c1f672ffe
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-server/src/main/conf/server-config.xml
View File

@@ -127,8 +127,8 @@
</Set>
</New>
</Set>
<<<<<<< mine
=======
<!-- TODO fix for jetty 9.2.x -->
<!-- request logging -->
<!--
@@ -211,6 +211,5 @@
</Call>
</Get>
-->
>>>>>>> theirs
</Configure>