Fix merge

2015-07-23 01:06:40 -03:00
parent 04a3fd4c81
commit 675b6c5c77
2 changed files with 0 additions and 10 deletions
--- 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",