diff options
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
|