remove merge comments

2025-11-14 17:26:22 +01:00 · 2017-01-12 20:51:55 +01:00
parent fc6287fd40
commit 0a22bc9919
1 changed files with 1 additions and 7 deletions
--- 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)