[smb4k/2.1] doc: Fix docbook

[Yuri Chornoivan]

Git commit f2b411a45adc1d98d9eb0a4fac205ba881596404 by Yuri Chornoivan.
Committed on 25/02/2018 at 10:32.
Pushed by yurchor into branch '2.1'.

Fix docbook

M  +0    -4    doc/index.docbook

https://commits.kde.org/smb4k/f2b411a45adc1d98d9eb0a4fac205ba881596404

diff --git a/doc/index.docbook b/doc/index.docbook
index 22030a0..a257fb6 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -27,11 +27,7 @@
     <holder>Alexander Reinholdt</holder>
   </copyright>
   <legalnotice>&underFDL;</legalnotice>
-<<<<<<< HEAD
-  <date>2018-01-07</date>
-=======
   <date>2018-02-22</date>
->>>>>>> 77700d2... Updated handbook.
   <releaseinfo>&smb4k; 2.1.0</releaseinfo><!--FIXME change releaseinfo number-->
   <abstract>
     <para>&smb4k; is an advanced network neighborhood browser and Samba share mounting utility.</para>