Permalink
Browse files

fontforge/python.c git clash which wasn't cleaned-up earlier.

  • Loading branch information...
1 parent 6c2cfa2 commit c262bef36b3e5efa8456a0e5f9cdb639286976c0 @JoesCat JoesCat committed May 7, 2013
Showing with 0 additions and 4 deletions.
  1. +0 −4 fontforge/python.c
View
@@ -10533,11 +10533,7 @@ static PyObject *fontiter_iternextkey(fontiterobject *di) {
#ifdef _HAS_LONGLONG
const char *dictfmt = "{sKsKsK}";
#else
-<<<<<<< local
- const char *dictfmt = "{sksksk}"
-=======
const char *dictfmt = "{sksksk}";
->>>>>>> other
#endif
PyObject *glyph, *tempdict;
PyObject *matched;

0 comments on commit c262bef

Please sign in to comment.