diff options
| author | Armin Le Grand <alg@apache.org> | 2013-04-08 11:51:43 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2013-04-08 11:51:43 +0000 |
| commit | 81c3404d82cb72b9d183e2b38034334e9b65fd22 (patch) | |
| tree | 2f568187b8a4737f1c4fc7428c697c23293cdf1d | |
| parent | 7b3f5521bd3c400cd9e08b745176b4ce40885011 (diff) | |
i121520 canged a 2nd 'Blue 9' entry to 'Blue nine' to solve the conflict
Notes
merged as: 6c65af22ee54c8bc4f3a5031bea0af9ecd4f0f00
| -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 ded82304ab6d..e877b9f2c438 100644 --- a/extras/source/palettes/standard.soc +++ b/extras/source/palettes/standard.soc @@ -148,7 +148,7 @@ <!-- #121520# 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"/> <!-- #121520# add 'pale' colors from original palette --> <draw:color draw:name="Violet" draw:color="#9999ff"/> |