add vraySublime

c135a862 · unknown · 4b87d104 · c135a862
Commit c135a862 authored Jul 01, 2015 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

v.json repository/v.json +0 -3

No files found.
--- a/repository/v.json
+++ b/repository/v.json
@@ -455,7 +455,6 @@
 			]
 		},
 		{
-<<<<<<< HEAD
 			"name": "VraySublime",
 			"details": "https://github.com/Aloiseau/VraySublime",
 			"releases": [
@@ -466,8 +465,6 @@
 			]
 		},
 		{
-=======
->>>>>>> 197be24657c13609e38d1bc5a6e93d297d5dbe6e
 			"name": "Vtex Snippets",
 			"details": "https://github.com/ricardodantas/Vtex-Snippets",
 			"releases": [