From 675b6c5c77775ad0e30129859779c1568b989ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Guimar=C3=A3es?=
 <francisco.guimaraes@tidexa.com>
Date: Thu, 23 Jul 2015 01:06:40 -0300
Subject: [PATCH]  Fix merge

---
 dist/lang/pt.js | 5 -----
 lang/pt.js      | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/dist/lang/pt.js b/dist/lang/pt.js
index 4972ca8a..1cc25363 100644
--- 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
index 4972ca8a..1cc25363 100644
--- 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",