Author: alg
Date: Mon Apr  8 12:51:43 2013
New Revision: 1465617

URL: http://svn.apache.org/r1465617
Log:
i121520 canged a 2nd 'Blue 9' entry to 'Blue nine' to solve the conflict

Modified:
    openoffice/trunk/main/extras/source/palettes/standard.soc

Modified: openoffice/trunk/main/extras/source/palettes/standard.soc
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/palettes/standard.soc?rev=1465617&r1=1465616&r2=1465617&view=diff
==============================================================================
--- openoffice/trunk/main/extras/source/palettes/standard.soc (original)
+++ openoffice/trunk/main/extras/source/palettes/standard.soc Mon Apr  8 
12:51:43 2013
@@ -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"/>


Reply via email to