Merge pull request #28 from antham/patch-1

Fix typo
mkchoi212 · Feb 4, 2018 · c86e474 · c86e474
2 parents 8f11fd7 + 9657490
commit c86e474
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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