Got them I all I think.


On Sun, Jan 20, 2013 at 12:00 PM, Nikolai Plath <notifications@github.com>wrote:

> In administrator/components/com_modules/models/modules.php:
>
> >  		foreach ($items as $item)
> > +=======
> > +		foreach($items as $item)
> > +>>>>>>> 5350d15 Some codestyle work.
>
> ... Oops again + several in between ;)
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/joomla/joomla-cms/pull/670/files#r2707825>.
>
>