ae74c356d9
Let's get rid of those merge conflicts. |
||
---|---|---|
.. | ||
e19 | ||
enlightenment | ||
gnome-2 | ||
gnome-3 | ||
kde-4.14 | ||
pantheon/apps/pantheon-terminal | ||
plasma-5.5 | ||
xfce |
ae74c356d9
Let's get rid of those merge conflicts. |
||
---|---|---|
.. | ||
e19 | ||
enlightenment | ||
gnome-2 | ||
gnome-3 | ||
kde-4.14 | ||
pantheon/apps/pantheon-terminal | ||
plasma-5.5 | ||
xfce |