Enfold 4.2.1 git diff in style.css

Hello there,
it seems you have a git diff in style.css in the 4.2.1 version of Enfold that I downloaded from Themeforest. My file looks like this:

/*
Theme Name: Enfold
<<<<<<< HEAD
Description: <strong>A superflexible and responsive Business Theme by Kriesi</strong> - <br/> Update notifications available on twitter, facebook and via newsletter:<br/> <a href='http://twitter.com/kriesi'>Follow me on twitter</a><br/> - <a href='http://www.facebook.com/pages/Kriesi/333648177216'>Join the Facebook Group</a> - <a href='http://kriesi.at/newsletter'>Subscribe to our Newsletter</a>
Version: 4.2.1
=======
Description: <strong>A superflexible and responsive Business Theme by Kriesi</strong> - <br/> Update notifications available on twitter, facebook and via newsletter:<br/> <a href='http://twitter.com/kriesi'>Follow me on twitter</a><br/> - <a href='http://www.facebook.com/pages/Kriesi/333648177216'>Join the Facebook Group</a> - <a href='https://kriesi.at/newsletter'>Subscribe to our Newsletter</a>
Version: 4.2
>>>>>>> parent of e546671... layerslider update
Author: Kriesi
Author URI: https://kriesi.at
License: Themeforest Split Licence
License URI: -
Theme URI: kriesi.at/themes/enfold/
*/

/*
* PLEASE DO NOT EDIT THIS FILE!
* 
* This file is only in your themefolder for WordPress to recognize basic theme data like name and version
* CSS Rules in this file will not be used by the theme. 
* Instead use the custom.css file that is located in your themes /css/ folder to add your styles. 
* You can copy a style rule from any of your css files and paste it in custom.css and
* it will override the original style. If you just want to add small css snippets you might also
* want to consider to add it to the designated CSS option field in your themes backend at: Theme Options->General Styling
*/

I wasn’t able to find any other occurances of git diff stuff, but thought I’d share my finding with you.

All the best

Stephanie Jagl-Posch
gugler* brand & digital

• This topic was modified 6 years, 7 months ago by gugler. Reason: Added the info that I downloaded the theme from Themeforest