summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-06-07 12:22:06 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-06-07 12:22:06 +0300
commit0e69f601aaafb920a9305c4ab5d380de2b43e917 (patch)
treef5e301b1f6e317b7efcaf347090fb35aa3cfc892 /support-files
parent7ae12371dd420eb7b7fcbd07bd49e2d1b28057d7 (diff)
parenteb14e073ea121954fb5be6fac92fd84b7d57bb07 (diff)
downloadmariadb-git-0e69f601aaafb920a9305c4ab5d380de2b43e917.tar.gz
Merge 10.4 into 10.5
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]