diff options
| author | bunnyhoney <bunnyhoney@o2.pl> | 2014-04-08 06:45:00 +0000 |
|---|---|---|
| committer | bunnyhoney <bunnyhoney@o2.pl> | 2014-04-08 06:45:00 +0000 |
| commit | 3ca6152e02bafdb1caf9899ed3275d3eabc7537a (patch) | |
| tree | 7dcd736faf827756577b9f0fcdb18b5578ef08fd /langpacks/polish/Plugins/Sametime.txt | |
| parent | 997052aead3e010233c5c20eb97c9bfad4881b27 (diff) | |
langpacks/polish update
git-svn-id: http://svn.miranda-ng.org/main/trunk@8887 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'langpacks/polish/Plugins/Sametime.txt')
| -rw-r--r-- | langpacks/polish/Plugins/Sametime.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/langpacks/polish/Plugins/Sametime.txt b/langpacks/polish/Plugins/Sametime.txt index 0e6398157f..9c14d48469 100644 --- a/langpacks/polish/Plugins/Sametime.txt +++ b/langpacks/polish/Plugins/Sametime.txt @@ -1,6 +1,4 @@ -<<<<<<< .mine
-=======
-#muuid {f1b0ba1b-0c91-4313-85eb-225069d44d01}
+#muuid {f1b0ba1b-0c91-4313-85eb-225069d44d01}
;============================================================
; File: Sametime.dll
; Plugin: Sametime Protocol
@@ -138,4 +136,3 @@ Prawda [False]
Fałsz
;file \protocols\Sametime\src\utils.cpp
->>>>>>> .r8726
|