Kaydet (Commit) 6c65af22 authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Caolán McNamara

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

to solve the conflict

(cherry picked from commit 81c3404d)

Change-Id: Ic368478dac25d9dce8e7c80bd3a7a33fdc68f3b0
üst efd10664
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<!-- #i121520# use some 'nice' colors from original palette --> <!-- #i121520# use some 'nice' colors from original palette -->
<draw:color draw:name="Blue gray" draw:color="#e6e6ff"/> <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 --> <!-- #i121520# add 'pale' colors from original palette -->
<draw:color draw:name="Violet" draw:color="#9999ff"/> <draw:color draw:name="Violet" draw:color="#9999ff"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment