Ticket #728 (closed maintenance: fixed)
Re-patch location module
| Reported by: | sam | Owned by: | sam |
|---|---|---|---|
| Priority: | major | Milestone: | Maintenance |
| Component: | Unassigned | Keywords: | |
| Cc: | paul, ed | Estimated Number of Hours: | 0.0 |
| Add Hours to Ticket: | 0 | Billable?: | yes |
| Total Hours: | 0.5 |
Description
Bugger just realised that I didn't finish the pull request into the main branch: /trac/ticket/681
So the location module patch is not on the live site.
I have now done the patch correctly I think: https://github.com/transitionnetwork/transitionnetwork.org-d6.profile/pull/2
Shall I additionally add the patch to the live site using Drush as I did before?
Thanks
Sam
Change History
comment:1 Changed 3 years ago by paul
- Add Hours to Ticket changed from 0.0 to 0.5
- Total Hours changed from 0.0 to 0.5
Note: See
TracTickets for help on using
tickets.
@Sam
Would you add the patch as you have done previously, and let me know how you made the change, thanks.
I have pulled in the changes that I had done earlier for the security update - this resulted in a merge conflict for your patch. I have now resolved this conflict on my local machine, committed locally, pushed, sent a pull request and then pulled.
https://github.com/transitionnetwork/transitionnetwork.org-d6.profile/blob/master/transitionnetwork.org-d6.make