Skip to content

Commit 6092f8f

Browse files
committed
fixup
1 parent 4e611d0 commit 6092f8f

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

WDL/_grammar.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,6 @@
244244
%ignore NEWLINE
245245
%ignore COMMENT
246246
"""
247-
<<<<<<< HEAD
248-
=======
249-
250-
assert set(versions.keys()) == set(keywords.keys())
251-
>>>>>>> origin/mlin-wdl2-runtime
252247

253248

254249
def get(version: Optional[str] = None) -> Tuple[str, Set[str]]:

0 commit comments

Comments
 (0)