[gsmartcontrol/f17] Update to latest upstream.

[Eric Smith]

commit 4eae1539fb180fe4816034a20f05c1d7fc12171c
Author: Eric Smith <eric at brouhaha.com>
Date:   Sat Oct 27 01:38:07 2012 -0600

    Update to latest upstream.

 gsmartcontrol.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/gsmartcontrol.spec b/gsmartcontrol.spec
index 6c81d90..3864f00 100644
--- a/gsmartcontrol.spec
+++ b/gsmartcontrol.spec
@@ -111,7 +111,6 @@ fi
 
 * Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 0.8.6-6
 - Rebuild against PCRE 8.30
->>>>>>> master
 
 * Mon Jan 16 2012 Eric Smith <eric at brouhaha.com>  0.8.6-5
 - Patch to compile with GCC 4.7.