User tests: Successful: Unsuccessful:
This time its the correct files being removed
Positions was only used in hathor
Preview has not been used for a very long time
Thanks @wilsonge
Status | New | ⇒ | Pending |
Category | ⇒ | Administration com_modules |
@tonypartridge I would if there were any
Oops sorry the mobile says no and the desktop says yes
Milestone |
Added: |
Milestone |
Added: |
You probably can't fix this one through the GitHub UI on its own.
Even when you delete/rename files, git can still track those operations so it sees that you tried one change and someone else tried another change and it creates a conflict because it gets confused.
best to close and create a new pr?
Unless George wants to just manually merge this then yes.
Status | Pending | ⇒ | Closed |
Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2017-06-14 19:53:40 |
Closed_By | ⇒ | brianteeman |
Sorry do it again. Will make sure it gets merged
Please fix conflicts :-)