From 374e8262efe5f2eba1832fce6f3944d57fca7cca Mon Sep 17 00:00:00 2001
From: Brian Rosenberger <bru@brutex.de>
Date: Tue, 5 Feb 2013 15:22:32 +0000
Subject: [PATCH] Arbeitsstand Anfang Februar

git-svn-id: https://brutex.net/svn/xservices/trunk@121 e7e49efb-446e-492e-b9ec-fcafc1997a86
---
 .../brutex/xservices/security/Identity.java   | 25 +++----------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/java/net/brutex/xservices/security/Identity.java b/src/java/net/brutex/xservices/security/Identity.java
index 65a2028..abdb8ea 100644
--- a/src/java/net/brutex/xservices/security/Identity.java
+++ b/src/java/net/brutex/xservices/security/Identity.java
@@ -1,17 +1,3 @@
-<<<<<<< .mine
-package net.brutex.xservices.security;
-
-import java.util.UUID;
-
-public abstract interface Identity
-{
-  public abstract UUID getUUID();
-}
-
-/* Location:           C:\Users\brosenberger\Documents\My Box Files\XBridgeNG-download\XServices-20130131 - Kopie\WEB-INF\classes\net.zip
- * Qualified Name:     net.brutex.xservices.security.Identity
- * JD-Core Version:    0.6.2
- */=======
 /*
  *   Copyright 2012 Brian Rosenberger (Brutex Network)
  *
@@ -32,12 +18,7 @@ package net.brutex.xservices.security;
 
 import java.util.UUID;
 
-
-
-public interface Identity {
-
-	public UUID getUUID();
-	
-	
+public abstract interface Identity
+{
+  public abstract UUID getUUID();
 }
->>>>>>> .r97