Commit7c67b9f

committed

Fix automerge issues

1 parentb7e674a commit7c67b9fCopy full SHA for 7c67b9f

File tree

-2

lines changed

-2

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@`
`64`	`64`
`65`	`65`	`defget_data_files(subdirectory,files='*.dat'):`
`66`	`66`	`returnglob.glob(os.path.join(test_dir,subdirectory,files))`
`67`		`-html5lib_test_files.__test__=False`
`68`	`67`
`69`	`68`	`classDefaultDict(dict):`
`70`	`69`	`def__init__(self,default,args,*kwargs):`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ def decode(inp):`
`138`	`138`	`deltoken[2][key]`
`139`	`139`	`token[2][decode(key)]=decode(value)`
`140`	`140`	`returntest`
`141`		`-unescape_test.__test__=False`
`142`	`141`
`143`	`142`	`defrunTokenizerTest(test):`
`144`	`143`	`#XXX - move this out into the setup function`

Comments

(0)