strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Related: #i121520# changed a 2nd 'Blue 9' entry to 'Blue nine'

Browse source 
to solve the conflict

(cherry picked from commit 81c3404d82cb72b9d183e2b38034334e9b65fd22)

Change-Id: Ic368478dac25d9dce8e7c80bd3a7a33fdc68f3b0
This commit is contained in:
Armin Le Grand 2013-04-08 11:51:43 +00:00 committed by Caolán McNamara
parent efd10664b7
commit 6c65af22ee
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extras/source/palettes/standard.soc
View file

@ -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"/>