Some files have unresolved merge conflicts

xyl0n / iris-light

A light version of the Iris Gtk theme. Aims to be clean, simple and bold.

GNU General Public License v3.0

168 stars 9 forks source link

Closed zyga closed 10 years ago

zyga commented 10 years ago

It's really not right to just 'git add *' and say 'conflicts resolved, ship it', you know.

xyl0n commented 10 years ago

I'm pretty sure I've fixed this now.