Übriggebliebene SVN Konfliktmeldungen beseitigt.

git-svn-id: https://svn.libreccm.org/ccm/trunk@402 8810af33-2d31-482b-a856-94f89814c4df
2010-04-30 08:03:44 +00:00 · 2010-04-30 08:03:44 +00:00 · e5b503780f
parent 0c7ae02e79
commit e5b503780f
1 changed files with 0 additions and 4 deletions
--- a/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java
+++ b/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java
@ -28,8 +28,4 @@ import com.arsdigita.domain.DomainServiceInterfaceExposer;
 */
 public class DefaultDomainService extends DomainServiceInterfaceExposer {

-<<<<<<< .mine
-=======
-
->>>>>>> .r389
 }