[WG: Sakai QA] SAK-18258 2.7.x merge conflicts

[Vargo, Anthony Paul]

Hi Zhen,

I'm attempting to merge the commits for SAK-18258 (r75571 -> 2.7.x), but I am running into a conflict with PermissionsHelperAction.java.  Could you please take a look and see if you can resolve it?  Here is the merge attempt summary:

--- Merging r75571 into '.':
C    authz-tool/tool/src/java/org/sakaiproject/authz/tool/PermissionsHelperAction.java
U    authz-tool/tool/src/bundle/authz-tool.properties
Summary of conflicts:
  Text conflicts: 1

Thanks,
- Anthony
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://collab.sakaiproject.org/pipermail/sakai-qa/attachments/20100409/775186eb/attachment.html