Attempt to merge into lp:unity failed due to conflicts:
text conflict in dash/previews/ActionButton.cpp text conflict in dash/previews/Preview.cpp
« Back to merge proposal
Attempt to merge into lp:unity failed due to conflicts:
text conflict in dash/previews/ ActionButton. cpp Preview. cpp
text conflict in dash/previews/