From 9657490482e2bfda329999b79450751ebb2d8799 Mon Sep 17 00:00:00 2001
From: Anthony HAMON <antham@users.noreply.github.com>
Date: Sun, 4 Feb 2018 11:51:10 +0100
Subject: [PATCH] Fix typo

---
 conflict/conflict.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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