summaryrefslogtreecommitdiff
path: root/langpacks/polish/Plugins/MirLua.txt
diff options
context:
space:
mode:
Diffstat (limited to 'langpacks/polish/Plugins/MirLua.txt')
-rw-r--r--langpacks/polish/Plugins/MirLua.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/langpacks/polish/Plugins/MirLua.txt b/langpacks/polish/Plugins/MirLua.txt
index 7c299f29c3..261b77aa04 100644
--- a/langpacks/polish/Plugins/MirLua.txt
+++ b/langpacks/polish/Plugins/MirLua.txt
@@ -2,11 +2,7 @@
;============================================================
; File: MirLua.dll
; Plugin: MirLua
-<<<<<<< .mine
-; Version: 0.11.5.0
-=======
; Version: 0.11.5.1
->>>>>>> .r15608
; Authors: Miranda NG team
;============================================================
[Extends Miranda NG functionality with Lua scripts.]