search

jemproject / JEM-Project

JEM - an Event Manager for Joomla
https://www.joomlaeventmanager.net
GNU General Public License v3.0
25 stars 37 forks source link

4.0.1dev2: #1635

Closed jojo12 closed 1 year ago

jojo12 commented 1 year ago

Better would be: request answer branch and then integrate other changes. But i fear it is too late. I feel negative!

Heklaterriol commented 1 year ago

Mckillo merged "request answer" into 4.0.1-dev. I then noticed that some of my changes were overwritten and I added them manually.

Is something missing in 4.0.1-dev2 which was in "request answer"?

mckillo commented 1 year ago

In the merge there were 10 conflicting files reviewed and solved all of them, only one about the string of Places Available don't merge and modified _desc about that string. On the 4.0.1.sql, I saw a duplicate line [IP:39], but I detected my error in the 4.0.1.sql and I created a new commit to solveing inmediatily.