From 0a22bc9919999620c891aaa451cfa44430ad0c99 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Thu, 12 Jan 2017 20:51:55 +0100
Subject: [PATCH] remove merge comments

---
 .../main/java/sonia/scm/filter/AdminSecurityFilter.java   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/filter/AdminSecurityFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/AdminSecurityFilter.java
index 328fb3a2ae..633f6aa3b5 100644
--- a/scm-webapp/src/main/java/sonia/scm/filter/AdminSecurityFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/filter/AdminSecurityFilter.java
@@ -77,15 +77,9 @@ public class AdminSecurityFilter extends SecurityFilter
   /**
    * Returns {@code true} if the subject has the admin role.
    *
-<<<<<<< working copy
-   * @param subject
-   *
-   * @return
-=======
    * @param subject subject
-   *
+   * 
    * @return {@code true} if the subject has the admin role
->>>>>>> merge rev
    */
   @Override
   protected boolean hasPermission(Subject subject)