Permalink
Browse files

Fixed a diff conflict I think.

  • Loading branch information...
1 parent b51e98b commit 7d44f2e6c7d7d09d17b71f49540b6bd04bd71654 @franksort committed Apr 11, 2012
Showing with 0 additions and 4 deletions.
  1. +0 −4 css3tool.py
View
@@ -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))

0 comments on commit 7d44f2e

Please sign in to comment.