diff options
| author | Anthony HAMON <antham@users.noreply.github.com> | 2018-02-04 11:51:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-04 11:51:10 +0100 |
| commit | 9657490482e2bfda329999b79450751ebb2d8799 (patch) | |
| tree | 1cb299d9ffc2c710924859d8990048ca2416cb61 | |
| parent | 8f11fd774ef39013746d4fa5f93a87eaac1df634 (diff) | |
Fix typo
| -rw-r--r-- | conflict/conflict.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conflict/conflict.go b/conflict/conflict.go index f820640..2952e2b 100644 --- a/conflict/conflict.go +++ b/conflict/conflict.go @@ -4,7 +4,7 @@ import ( "github.com/mkchoi212/fac/color" ) -// Conflict represents a single conflict that may have occured +// Conflict represents a single conflict that may have occurred type Conflict struct { Choice int FileName string |