From 25a42aa330186a78c1d5db46aad6685d405787d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Masarczyk?= <pawelmasarczyk@gmail.com>
Date: Mon, 7 Apr 2014 22:15:03 +0000
Subject: Langpack Polish: update

git-svn-id: http://svn.miranda-ng.org/main/trunk@8885 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 langpacks/polish/Plugins/Sametime.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'langpacks/polish/Plugins/Sametime.txt')

diff --git a/langpacks/polish/Plugins/Sametime.txt b/langpacks/polish/Plugins/Sametime.txt
index 6a92a22784..0e6398157f 100644
--- a/langpacks/polish/Plugins/Sametime.txt
+++ b/langpacks/polish/Plugins/Sametime.txt
@@ -1,3 +1,5 @@
+<<<<<<< .mine
+=======
 #muuid {f1b0ba1b-0c91-4313-85eb-225069d44d01}
 ;============================================================
 ;  File: Sametime.dll
@@ -136,3 +138,4 @@ Prawda
 [False]
 Fałsz
 ;file \protocols\Sametime\src\utils.cpp
+>>>>>>> .r8726
-- 
cgit v1.2.3