Merge pull request wbond#2675 from Zeeker/master

Added Git Conflict Resolver
rctay · Jan 22, 2014 · 7134f69 · 7134f69
2 parents cfe54ab + d583b79
commit 7134f69
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/repository/g.json b/repository/g.json
@@ -195,6 +195,16 @@
 				}
 			]
 		},
+		{
+			"name": "Git Conflict Resolver",
+			"details": "https://github.com/Zeeker/sublime-GitConflictResolver",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/Zeeker/sublime-GitConflictResolver/tags"
+				}
+			]
+		},
 		{
 			"name": "Git Status Files",
 			"details": "https://github.com/mkraft/git-status-files",