Bugfix.

14 years ago · 63e34e82db
parent a269fae618
commit 63e34e82db
1 changed files with 0 additions and 7 deletions
--- a/desktop/00-desktop-init/empty_dir/0ini.env
+++ b/desktop/00-desktop-init/empty_dir/0ini.env
@ -10,17 +10,10 @@ patch = 2.2.0.0
 patch = on

 [resource]
-<<<<<<< HEAD
-#?ur_domain_set==on#
-path = /home/#-ur_login-#/Home
-#ur_domain_set#
-#?ur_domain_set==off#
-=======
 #?env(client.os_remote_auth)!=&&ur_domain_set==on#
 path = /home/#-ur_login-#/Home
 #env#
 #?env(client.os_remote_auth)==||ur_domain_set==off#
->>>>>>> 6d276212d89adad7e39722fcdbb58c28e969231f
 path = /home/#-ur_login-#
 #ur_domain_set#