diff options
Diffstat (limited to 'docs/ref/databases.txt')
| -rw-r--r-- | docs/ref/databases.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 738fd96fea..3cff1c61cb 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -257,10 +257,7 @@ Here's a sample configuration which uses a MySQL option file:: } } -<<<<<<< HEAD:docs/ref/databases.txt -======= ->>>>>>> master:docs/ref/databases.txt # my.cnf [client] database = NAME |