diff options
author | Armin Le Grand <alg@apache.org> | 2013-04-08 11:51:43 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-20 14:58:51 +0100 |
commit | 6c65af22ee54c8bc4f3a5031bea0af9ecd4f0f00 (patch) | |
tree | 4fdfbf2df68c9510441fc6c1281593f0fcba01ce /extras | |
parent | efd10664b7808b531676cbbb402703bcc644b0d1 (diff) |
Related: #i121520# changed a 2nd 'Blue 9' entry to 'Blue nine'
to solve the conflict
(cherry picked from commit 81c3404d82cb72b9d183e2b38034334e9b65fd22)
Change-Id: Ic368478dac25d9dce8e7c80bd3a7a33fdc68f3b0
Diffstat (limited to 'extras')
-rw-r--r-- | extras/source/palettes/standard.soc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc index 7e1678ed3160..49b00696be2a 100644 --- a/extras/source/palettes/standard.soc +++ b/extras/source/palettes/standard.soc @@ -148,7 +148,7 @@ <!-- #i121520# use some 'nice' colors from original palette --> <draw:color draw:name="Blue gray" draw:color="#e6e6ff"/> - <draw:color draw:name="Blue 9" draw:color="#CFE7F5"/> + <draw:color draw:name="Blue nine" draw:color="#CFE7F5"/> <!-- #i121520# add 'pale' colors from original palette --> <draw:color draw:name="Violet" draw:color="#9999ff"/> |