README 1.8.2

3 years ago · b1c284b73f
parent 02fae1bb33 f500681504
commit b1c284b73f
1 changed files with 7 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -2,7 +2,13 @@ zncstrap
 ========

 Modified by casper@LunarBNC for 1.8.2
+<<<<<<< HEAD
 Some things were added and mainly all pages needed i18n as well.

 ### Source
-https://github.com/FirrreHQ/zncstrap
+https://github.com/FirrreHQ/zncstrap
+=======
+
+### Source
+https://github.com/FirrreHQ/zncstrap
+>>>>>>> f5006815042dd5f6109f0e83161ee8c59da0d5ee