Aggiunto file l.json modificato

repository/l.json

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