From bdd258850da202e1180411813f6998acc64b60ab Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Wed, 20 Mar 2013 11:49:55 +0100
Subject: Portuguese translation update, 2nd try

trying to come to grips with Github...
---
 lang-pt.js | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'lang-pt.js')

diff --git a/lang-pt.js b/lang-pt.js
index 656cbc5..5f14a22 100644
--- a/lang-pt.js
+++ b/lang-pt.js
@@ -185,11 +185,7 @@ SnapTranslator.dict.pt = {
     'translator_e-mail':
         'mmsequeira@gmail.com',
     'last_changed':
-<<<<<<< HEAD
-        '2013-03-19',
-=======
         '2013-03-20',
->>>>>>> Portuguese translation update
 
     // GUI
     // control bar:
@@ -291,11 +287,7 @@ SnapTranslator.dict.pt = {
 
     // movimento:
     'Stage selected:\nno motion primitives':
-<<<<<<< HEAD
-        'Palco seleccionado:\sem primitivas de movimento',
-=======
         'Palco seleccionado:\nsem primitivas de movimento',
->>>>>>> Portuguese translation update
 
 
     'move %n steps':
-- 
cgit v1.3.1