summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorJulius Goryavsky <julius.goryavsky@mariadb.com>2020-06-05 18:32:37 +0200
committerJulius Goryavsky <julius.goryavsky@mariadb.com>2020-06-05 18:32:37 +0200
commit5f55f69e4a237deb98cd4fc7d6ea9a17a8fe63bb (patch)
treed9031bb02e1807d0324b9f802dcf72eb8e3768a6 /support-files
parentefc70da5fd0459ff44153529d13651741cc32bc4 (diff)
parent3f019d1771d4e6e21f941b72a83e0663f15b376f (diff)
downloadmariadb-git-5f55f69e4a237deb98cd4fc7d6ea9a17a8fe63bb.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'support-files')
-rw-r--r--support-files/rpm/my.cnf2
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/rpm/my.cnf b/support-files/rpm/my.cnf
index 8c6a7139de5..5cda317d29e 100644
--- a/support-files/rpm/my.cnf
+++ b/support-files/rpm/my.cnf
@@ -1,5 +1,5 @@
#
-# This group is read both both by the client and the server
+# This group is read both by the client and the server
# use it for options that affect everything
#
[client-server]