summaryrefslogtreecommitdiffstats
path: root/pkg/commands
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-04-18 18:07:10 +1000
committerJesse Duffield <jessedduffield@gmail.com>2021-04-18 18:58:09 +1000
commit98375dc902513a8b0759985a270d8d895cba1199 (patch)
treecf3d55df66def3da29b03be9985a70ad1eb73435 /pkg/commands
parente73de332a1efcc8f25e5e0f4f9e0a42d7aabb923 (diff)
refactor merge panel
Diffstat (limited to 'pkg/commands')
-rw-r--r--pkg/commands/git_structs.go9
1 files changed, 0 insertions, 9 deletions
diff --git a/pkg/commands/git_structs.go b/pkg/commands/git_structs.go
deleted file mode 100644
index 1590ce32e..000000000
--- a/pkg/commands/git_structs.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package commands
-
-// Conflict : A git conflict with a start middle and end corresponding to line
-// numbers in the file where the conflict bars appear
-type Conflict struct {
- Start int
- Middle int
- End int
-}