Corretto errore

repository/l.json

@@ -666,7 +666,6 @@
 			]
 		},
 		{
-<<<<<<< HEAD
 			"name": "LockTab",
 			"details": "https://github.com/DavidGerva/LockTab-Sublime-Plugin",
 			"releases": [
@@ -676,7 +675,7 @@
 				}
 			]
       },
-=======
+      {
 			"name": "LocalVariable",
 			"details": "https://github.com/shagabutdinov/sublime-local-variable",
 			"donate": "https://github.com/shagabutdinov/sublime-enhanced/blob/master/readme-donations.md",
@@ -688,7 +687,6 @@
 				}
 			]
 		},
->>>>>>> upstream/master
 		{
 			"name": "Logger Snippets",
 			"details": "https://github.com/ssrihari/sublime-logger-snippets",