diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-05-24 17:12:54 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-05-24 17:12:54 +1000 |
| commit | 771c61e9659d7fd469b91736462f5e3399f70868 (patch) | |
| tree | a19e5b83fe93634e2ec8d1467f496da3d2806aa3 /man | |
| parent | 571a8f4a086470d5cf6fc4ccd3ec755ee67f87d7 (diff) | |
| download | mariadb-git-771c61e9659d7fd469b91736462f5e3399f70868.tar.gz | |
man: merge error in mysqld.8
Diffstat (limited to 'man')
| -rw-r--r-- | man/mysqld.8 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/man/mysqld.8 b/man/mysqld.8 index dd19bcb8480..83a4efb5895 100644 --- 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 .\" ----------------------------------------------------------------- |