Fixed a diff conflict I think.

franksort · Apr 11, 2012 · 7d44f2e · 7d44f2e
1 parent b51e98b
commit 7d44f2e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/css3tool.py b/css3tool.py
@@ -128,11 +128,7 @@ def func(t):
 t_NOT = make_simple('NOT', r'not\(')
 t_URI = make_simple('URI', r'url\(({0}|{1})\)'.format(string, url))
 t_FUNCTION = make_simple('FUNCTION', r'{0}\('.format(ident))
-<<<<<<< HEAD
 t_HASH = make_simple('HASH', r'\#{0}'.format(name))
-=======
-t_HASH= make_simple('HASH', r'\#{0}'.format(name))
->>>>>>> 69d455ace194922c00ea0e711c5fffbffb984d8e
 t_DIMENSION = make_simple('DIMENSION', r'{0}{1}'.format(num, ident))
 t_PERCENTAGE = make_simple('PERCENTAGE', r'{0}\%'.format(num))