diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2014-03-03 18:29:08 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-03-04 13:57:02 +1000 |
| commit | 2330a6458976f20e6039ddbb5a0e00ea939b392a (patch) | |
| tree | dc949a9742945298c71df253481ef1cf8a7e45d2 /src/util | |
| parent | 1afddd74a978631ff4f15d450b96d66e7af1e768 (diff) | |
sync_prepare: ignore explicitly removed conflicts
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src/util')
0 files changed, 0 insertions, 0 deletions