Merge pull request #2675 from Zeeker/master

Added Git Conflict Resolver

Merge pull request #2675 from Zeeker/master
Added Git Conflict Resolver
7134f695 · FichteFoll · cfe54aba · d583b79a · 7134f695
Commit 7134f695 authored Jan 22, 2014 by FichteFoll
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

g.json repository/g.json +10 -0

No files found.
--- 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",