Review TYPO3_6-0 Merged 23626[TASK] Remove conflict code Wouter Wolters CR +2 V +2 Easy +0 −3 updated 09/04/13, 20:28 Open in Gerrit Commit message Show more Remove conflict code which was luckily inside doc-comments. Resolves: #51745 Releases: 6.1, 6.0 Change-Id: I2a175000028fb12a7a1558494e70b9183dd61786 Reviewed-on: https://review.typo3.org/23626 Reviewed-by: Wouter Wolters Tested-by: Wouter Wolters Review Code review CR +2 Wouter Wolters +2 Verified V +2 Wouter Wolters +2 Issues 1 Task #51745Remove conflict code Resolved by this change Closed Code Cleanup v6.0 Wouter Wolters 09/04/13, 20:09 Files 1 typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php+0 −3 Review log 2 Wouter Wolters voted on patch set 1 V +2 CR +2 09/04/13, 20:28 Wouter Wolters merged patch set 2 09/04/13, 20:28