summaryrefslogtreecommitdiff
path: root/langpacks/polish/Plugins/Dropbox.txt
diff options
context:
space:
mode:
Diffstat (limited to 'langpacks/polish/Plugins/Dropbox.txt')
-rw-r--r--langpacks/polish/Plugins/Dropbox.txt5
1 files changed, 0 insertions, 5 deletions
diff --git a/langpacks/polish/Plugins/Dropbox.txt b/langpacks/polish/Plugins/Dropbox.txt
index 72edcdd462..af021f402f 100644
--- a/langpacks/polish/Plugins/Dropbox.txt
+++ b/langpacks/polish/Plugins/Dropbox.txt
@@ -39,13 +39,8 @@ Kopiuj link do pobrania do schowka
w toku...
[you have been authorized]
zostałeś zautoryzowany
-<<<<<<< .mine
-[server does not respond]
-Serwer nie odpowiada
-=======
[server does not respond]
serwer nie odpowiada
->>>>>>> .r8577
;file \plugins\Dropbox\src\dropbox_commands.cpp
[Dropbox supports the following commands:]
Dropbox obsługuje następujące polecenia: