diff options
Diffstat (limited to 'man/mysqld.8')
| -rw-r--r-- | man/mysqld.8 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/man/mysqld.8 b/man/mysqld.8 index ffa746edd64..dd19bcb8480 100644 --- a/man/mysqld.8 +++ b/man/mysqld.8 @@ -1,6 +1,10 @@ '\" 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 .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- |