Merge conflicts commited into tribe-common.pot

Hey Arunas!

So sorry about this. I will make sure it’s corrected in our next release, but for now here is a workaround:

Directly edit the file and remove the entries for 4.15.0.1

So, this:

<<<<<<< HEAD
#. #-#-#-#-#  tribe-common.pot (Tribe Common 4.15.1)  #-#-#-#-#
=======
#. #-#-#-#-#  tribe-common.pot (Tribe Common 4.15.0.1)  #-#-#-#-#
>>>>>>> f93b76d129a41f3c664d11b7324b2cad001f6d80

Will become this:

#. #-#-#-#-#  tribe-common.pot (Tribe Common 4.15.1)  #-#-#-#-#

and this:

<<<<<<< HEAD
"Project-Id-Version: Tribe Common 4.15.1\n"
"Report-Msgid-Bugs-To: https://m.tri.be/191x\n"
"POT-Creation-Date: 2022-05-26 11:32:28+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2022-05-26 11:32\n"
=======
"Project-Id-Version: Tribe Common 4.15.0.1\n"
"Report-Msgid-Bugs-To: https://m.tri.be/191x\n"
"POT-Creation-Date: 2022-06-08 16:36:31+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2022-06-08 16:36\n"
>>>>>>> f93b76d129a41f3c664d11b7324b2cad001f6d80

Will become

"Project-Id-Version: Tribe Common 4.15.1\n"
"Report-Msgid-Bugs-To: https://m.tri.be/191x\n"
"POT-Creation-Date: 2022-05-26 11:32:28+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2022-05-26 11:32\n"

…and again, I will ensure that those changes get made in our next release!

Hi Stephen!

We do know how to fix a merge conflict (wink). Just wanted to make sure you are aware of this. As it is in a .pot file, I don’t think it will mess up many things for people. The only reason we noticed this is because we do code reviews for plugin updates before we merge them into our setup.

Arunas,

Sorry, I never know for sure and it feels safer to not assume ??

I really appreciate you catching this! Thanks again – the fix is already in the code changes for the next release!

Stephen

Hey @camwynsp!

That issue was fixed on the TEC version released today!

Please update your Events Calendar plugin to apply that to your site.

Best Regards

@ideag

I implemented that fix and it’s in yesterday’s release – thanks again!

Stephen