From 637090d25976da9c39fa1ac8bbc7dd20c22f8c41 Mon Sep 17 00:00:00 2001
From: igorjuraszek <igorjuraszek@MacBook-Air-Igor.local>
Date: Wed, 5 Sep 2018 22:39:18 +0200
Subject: [PATCH] minor polish translation fixes

---
 locales/pl.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/locales/pl.json b/locales/pl.json
index 46484ef5..124c43f7 100644
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -19,12 +19,8 @@
 	".md": ".md",
 	".txt": ".txt",
 	".html": ".html",
-<<<<<<< HEAD
-	"Print": "Drukuj",
-=======
   "Print": "Drukuj",
   "Help": "Pomoc",
->>>>>>> f4203263bbca6a1a7c4f489df427db957c8fc136
 	"Your preferences for Boostnote": "Twoje ustawienia dla Boostnote",
 	"Storages": "Storages",
 	"Add Storage Location": "Dodaj miejsce zapisu",