Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 17:26:22 +01:00
Code Issues Packages Projects Releases Activity

remove merge comments

Browse Source
This commit is contained in:
Sebastian Sdorra
2017-01-12 20:51:55 +01:00
parent fc6287fd40
commit 0a22bc9919
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/filter/AdminSecurityFilter.java
View File

@@ -77,15 +77,9 @@ public class AdminSecurityFilter extends SecurityFilter
/** /**
* Returns {@code true} if the subject has the admin role. * Returns {@code true} if the subject has the admin role.
* *
<<<<<<< working copy
* @param subject
*
* @return
=======
* @param subject subject * @param subject subject
* *
* @return {@code true} if the subject has the admin role * @return {@code true} if the subject has the admin role
>>>>>>> merge rev
*/ */
@Override @Override
protected boolean hasPermission(Subject subject) protected boolean hasPermission(Subject subject)