Skip to content
This repository has been archived by the owner on Jul 26, 2020. It is now read-only.

Unresolved merge conflicts #41

Open
DarthPumpkin opened this issue Oct 14, 2017 · 1 comment
Open

Unresolved merge conflicts #41

DarthPumpkin opened this issue Oct 14, 2017 · 1 comment

Comments

@DarthPumpkin
Copy link

In the swift speed benchmark, introduced in commit e0cd9df

<<<<<<< HEAD

>>>>>>> dev

<<<<<<< HEAD

>>>>>>> dev

@stsievert
Copy link
Owner

Could you put in a PR for this? I’m afraid it’ll take a long time for me to fix it.

# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants