From 18c90943bf8e863c10cf337da9c63c36b78eac10 Mon Sep 17 00:00:00 2001
From: Ben Hilburn <bhilburn@gmail.com>
Date: Sun, 29 Mar 2015 19:14:26 -0700
Subject: [PATCH] Cleaning up README section regarding color scheme selection.

---
 README.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 4bc95e32..f780cd63 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,6 @@ elements (it is by default), and define a `DEFAULT_USER` in your `~/.zshrc`:
 
     export DEFAULT_USER=<your username>
 
-<<<<<<< HEAD
 ### Styling
 
 You can configure the look and feel of your prompt easily with some built-in
@@ -123,10 +122,8 @@ to `light` in your `~/.zshrc`, and you're all set!
 
     POWERLEVEL9K_COLOR_SCHEME='light'
 
-#### Solarized colors
-
-If you want your terminal colors not so bright, you may want to use an alternate 
-color scheme. One of them is "solarized": https://github.com/altercation/solarized
+The 'light' color scheme works well for ['Solarized
+Light'](https://github.com/altercation/solarized) users.
 
 ### Bugs / Contact