I accidently worked on the master where I had to open up a new branch.
I reverted it to its original form almost completely. At one class I get the following diff that I can not make sense out of.
index 4a9abb8..7c55879 100755
--- a/includes/site.inc.php
+++ b/includes/site.inc.php
@@ -142,11 +142,11 @@ class site{
public $tplEngine = 'smarty';
-
+
private $_productsByType = array();
private $logger;
- protected $locale = 'tr_TR';
-
+ protected $locale = 'tr_TR';
+
It says that I have deleted and added the same thing, in principle there is no difference with the original index and I don't want this file to be seen as modified.
What should I do ? Thx.
Check spaces. The replaced "empty" looking lines have spaces in them. You may also have accidentally replaced tabs with spaces or vice versa.