man: merge error in mysqld.8

MariaDB · May 24, 2022 · 771c61e · 771c61e
1 parent 571a8f4
commit 771c61e
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/man/mysqld.8 b/man/mysqld.8
@@ -1,10 +1,6 @@
 '\" t
 .\"
-<<<<<<< HEAD
-.TH "\FBMYSQLD\FR" "8" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
-=======
-.TH "\FBMARIADBD\FR" "8" "27 June 2019" "MariaDB 10\&.5" "MariaDB Database System"
->>>>>>> 10.5-MDEV-28376-mariadb-report
+.TH "\FBMARIADBD\FR" "8" "15 May 2020" "MariaDB 10\&.6" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------