1746e30 Fix conflicts with gnome-desktop3 harder

Authored and Committed by Christopher Aillon 9 years ago
    Fix conflicts with gnome-desktop3 harder
    
    We'll likely keep running into conflicts so just kill these alltogether
    
        
file modified
+6 -5