Another error: 


First, rewinding head to replay your work on top of it... 
Fast-forwarded master to 0a11780c3dab081c0c8885ec2141237c1591498d. 
git stash pop 
Auto-merging po/eu.po 
CONFLICT (content): Merge conflict in po/eu.po 
*** Error during phase checkout of gdk-pixbuf: ########## Error running git 
stash pop *** [7/33] 


Regards, 
-Allan Registos 



_______________________________________________
gnome-shell-list mailing list
gnome-shell-list@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-shell-list

Reply via email to