Miss All Sunday

<<<<<<< HEAD

foreach ($type as $t)
cache_put_data(self::$name .':'. $t, '');
}
=======
>>>>>>> github/master

foreach ($type as $t)
cache_put_data(self::$name .':'. $t, '');
}

Seriously?

All the documentation they have is for the command line thing, which I detest with all my heart (thats material for another rant).

I already tried everything, no luck, perhaps it's just a blank line, something really stupid, dunno.

Really, really fed up of this git conflicts...  No matter what I do there is always a file with a merge conflict that just doesn't go away, I resolve the conflict, update the file, stage the file and then on commit git doesn't recognize the fix or it thinks I added something else, which of course is totally false...