diff options
Diffstat (limited to 'langpacks/polish/Plugins/Sametime.txt')
| -rw-r--r-- | langpacks/polish/Plugins/Sametime.txt | 3 |
1 files changed, 3 insertions, 0 deletions
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
|