Error with text area plugin

[koze85]

On a clean install Joomla 3 and Fabrik 3.1 I got errors from the textarea plugin
Front end and back end

After commenting out the lines

156 <<<<<<< HEAD

and

158 =======

and

162 >>>>>>> 12f16514977c4733beef7cb694cc62cc38de33a8

It works fine

anybody knows what these are???

 

[margarett]

I also got that error and solved it the same way you did.
I don't know if it has side effects or not, but it is running nevertheless...

 

[rob]

sorry about that - a partially merged file got committed by accident.
Should be fixed now

-Rob