Rename conflict to parse

mkchoi212 · Dec 29, 2017 · 33bd902 · 33bd902
1 parent b8b302f
commit 33bd902
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/conflict.go → parse.go b/conflict.go → parse.go