Fix merge

Francisco Guimarães · Francisco Guimarães · commit 675b6c5c7777 · 2015-07-23T01:06:40.000-03:00
diff --git a/dist/lang/pt.js b/dist/lang/pt.js
@@ -25,13 +25,8 @@ window.SwaggerTranslator.learn({
     "Show/Hide":"Mostrar/Esconder",
     "List Operations":"Listar operações",
     "Expand Operations":"Expandir operações",
-<<<<<<< HEAD
     "Raw":"Cru",
     "can't parse JSON.  Raw result":"Falha ao analisar JSON.  Resulto cru",
-=======
-    "Raw":"Raw",
-    "can't parse JSON.  Raw result":"can't parse JSON.  Raw result",
->>>>>>> stable
     "Model Schema":"Modelo esquema",
     "Model":"Modelo",
     "apply":"Aplicar",
diff --git a/lang/pt.js b/lang/pt.js
@@ -25,13 +25,8 @@ window.SwaggerTranslator.learn({
     "Show/Hide":"Mostrar/Esconder",
     "List Operations":"Listar operações",
     "Expand Operations":"Expandir operações",
-<<<<<<< HEAD
     "Raw":"Cru",
     "can't parse JSON.  Raw result":"Falha ao analisar JSON.  Resulto cru",
-=======
-    "Raw":"Raw",
-    "can't parse JSON.  Raw result":"can't parse JSON.  Raw result",
->>>>>>> stable
     "Model Schema":"Modelo esquema",
     "Model":"Modelo",
     "apply":"Aplicar",
