Chris Wanstrath
eef0f4d2dc
# Conflicts: # package.json # src/cli/index.ts # src/parse.test.ts # src/parse.ts
4 lines
405 B
TypeScript
4 lines
405 B
TypeScript
The TypeScript content you pasted doesn't contain any merge conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`). The file appears to be clean and complete.
|
|
|
|
I found merge conflicts in other files in the repo, but none in a `parse.ts` file. Could you clarify which file has the conflict, or re-paste the content with the conflict markers visible? It's possible they were stripped during message formatting.
|