Fix merge

hao · Jul 23, 2015 · 675b6c5 · 675b6c5
1 parent 04a3fd4
commit 675b6c5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
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",