Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
remove unneeded conflict against the "snappy" package
LP: #1574114
- Loading branch information
LP: #1574114