Fix bad merge
This commit is contained in:
parent
ed37cb6666
commit
b6cf7bb9e3
@ -2,14 +2,6 @@
|
||||
<creole>
|
||||
|
||||
<files>
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
|
||||
>>>>>>> master
|
||||
=======
|
||||
>>>>>>> master
|
||||
<file filelist='lemonldap' name='/etc/lemonldap-ng/lemonldap-ng.ini' mkdir='True' rm='True'/>
|
||||
<file filelist='lemonldap' name='/var/lib/lemonldap-ng/conf/lmConf-1.json' mkdir='True' rm='True'/>
|
||||
<file filelist='lemonldap' name='/etc/default/lemonldap-ng-fastcgi-server' mkdir='True' rm='True'/>
|
||||
|
Loading…
Reference in New Issue
Block a user