[graphite2/f15] Silly merge typo

[Nicholas van Oudtshoorn]

commit fa59d6a9dbe4d4076e7c875021d2b40bdbbf296a
Author: Nicholas van Oudtshoorn <vanoudt at gmail.com>
Date:   Fri Aug 26 17:48:31 2011 +0800

    Silly merge typo

 graphite2.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/graphite2.spec b/graphite2.spec
index 043ef4f..01c0804 100644
--- a/graphite2.spec
+++ b/graphite2.spec
@@ -51,7 +51,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %files
 %defattr(-,root,root,-)
 %doc LICENSE COPYING ChangeLog doc/manual.html
->>>>>>> master
 %{_bindir}/gr2fonttest
 %{_libdir}/libgraphite2.so.2.0.0