From e5b503780f2cc0ddef9fcc26d762b03d6f26e4bf Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 30 Apr 2010 08:03:44 +0000
Subject: [PATCH] =?UTF-8?q?=C3=9Cbriggebliebene=20SVN=20Konfliktmeldungen?=
 =?UTF-8?q?=20beseitigt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@402 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java b/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java
index e3866217d..b1ee26d6b 100755
--- 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
 }