Merge conflict

This commit is contained in:
Mark Badolato 2014-01-09 02:08:28 -07:00
commit 367f80591f

View file

@ -5,11 +5,11 @@
<key>Ansi 0 Color</key>
<dict>
<key>Blue Component</key>
<real>0.06252925843000412</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.074575141072273254</real>
<real>0.0</real>
<key>Red Component</key>
<real>0.090774968266487122</real>
<real>0.0</real>
</dict>
<key>Ansi 1 Color</key>
<dict>
@ -131,11 +131,11 @@
<key>Ansi 8 Color</key>
<dict>
<key>Blue Component</key>
<real>0.06252925843000412</real>
<real>0.0</real>
<key>Green Component</key>
<real>0.074575141072273254</real>
<real>0.0</real>
<key>Red Component</key>
<real>0.090774968266487122</real>
<real>0.0</real>
</dict>
<key>Ansi 9 Color</key>
<dict>
@ -149,11 +149,11 @@
<key>Background Color</key>
<dict>
<key>Blue Component</key>
<real>0.06252925843000412</real>
<real>0.098039217293262482</real>
<key>Green Component</key>
<real>0.074575141072273254</real>
<real>0.12156862765550613</real>
<key>Red Component</key>
<real>0.090774968266487122</real>
<real>0.15294118225574493</real>
</dict>
<key>Bold Color</key>
<dict>