Closed skyriacoCMS closed 9 years ago
There are some conflicts with the HEAD, I'm unable to merge automatically. Can you clean things up so they merge correctly (you may have to rebase).
Never mind, this was trivial (whitespace difference) so I just merged by hand.
There are some conflicts with the HEAD, I'm unable to merge automatically. Can you clean things up so they merge correctly (you may have to rebase).