search

CraigT543 / EasyBlue

Modifications for Easy!Appointments
21 stars 23 forks source link

Bug in your EA fork in Email.php #34

Closed oxteam closed 5 years ago

oxteam commented 5 years ago

Hi Craig,

It looks like I cannot open an issue in your ford of EA (https://github.com/CraigT543/easyappointments ). Thus, I opened an issue in EasyBlue in order for you to be warned.

So, in your EA fork, the latest revision of Email.php in your master branch contains conflict markers around line 169 (https://github.com/CraigT543/easyappointments/commit/55bdd2bb8036f8be14f7d3d08b7e2bbcf7c633da)

        // Prepare template replace array.
        $replaceArray = [
<<<<<<< HEAD
            '$provider_address' => str_replace(', ,','',$address_provider), 
=======
            '$provider_address' => str_replace(', ,','',$address_provider),  
>>>>>>> 64ef358edd11937ce163961f3d6ece5e5f44eb13

Hope it helps

oxteam commented 5 years ago

I close the issue as you fixed it.