From 9b0f80cd1a2d61574f0a1b5c533b2c549e38fdab Mon Sep 17 00:00:00 2001
From: Ryan Daigle <ryan.daigle@gmail.com>
Date: Thu, 23 Feb 2012 19:25:15 -0500
Subject: [PATCH] Update theme. Update update script to do an upstream merge
 vs. rebase

---
 themes/clean | 2 +-
 update.sh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/clean b/themes/clean
index 0eaa112..4dae6d6 160000
--- a/themes/clean
+++ b/themes/clean
@@ -1 +1 @@
-Subproject commit 0eaa112d7de58a58007e27078bba21c10a2a4cc8
+Subproject commit 4dae6d66d6a211d4906c44602a8b4d2e2ca233f2
diff --git a/update.sh b/update.sh
index 346f432..09b13c1 100755
--- a/update.sh
+++ b/update.sh
@@ -4,7 +4,7 @@ git commit -m "Commit changes prior to template update"
 git checkout upstream
 git pull upstream master
 git checkout master
-git rebase upstream
+git merge upstream
 cd themes/clean
 git pull origin master
 cd ../..