summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2014-03-06 12:45:07 +0100
committerBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2014-03-06 12:45:07 +0100
commit22bec1c2db3148770c16b369d453c1933aec7894 (patch)
treecd5418b327603deb7e59d181ddf6f0abf7f1fa34 /packaging
parentce3c0ade5fa2d8d87d7530cf8500819d90030d10 (diff)
downloadmariadb-git-22bec1c2db3148770c16b369d453c1933aec7894.tar.gz
Corrected typo in changelog
Diffstat (limited to 'packaging')
-rw-r--r--packaging/rpm-oel/mysql.spec.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in
index ef06563c04a..232f70fe809 100644
--- a/packaging/rpm-oel/mysql.spec.in
+++ b/packaging/rpm-oel/mysql.spec.in
@@ -816,7 +816,7 @@ fi
%changelog
* Thu Mar 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-2
-- Resolve confict issues during upgrade
+- Resolve conflict issues during upgrade
* Mon Feb 10 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-1
- Add support for el7 (with systemd enabled)