Attempt to merge into lp:pantheon-files failed due to conflicts:
text conflict in src/View/AbstractDirectoryView.vala
« Back to merge proposal
Attempt to merge into lp:pantheon-files failed due to conflicts:
text conflict in src/View/ AbstractDirecto ryView. vala