Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase on mpickering ghcide at wip/multi-rebase #73

Merged
merged 4 commits into from
Apr 26, 2020

Conversation

alanz
Copy link
Collaborator

@alanz alanz commented Apr 23, 2020

Commit 256f8b50415a08454d471a6a28f742c0a1e39978
And now re-rebased on a68273a3f8b30e1bc48eba6e7053163ca4e5bc47
now 3dde18f06ea18731bb3befa0d81af9a6b894d917

cabal.project Outdated
Comment on lines 12 to 13
location: https://github.com/fendor/hie-bios.git
tag: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99
tag: 87db34de1b10b03bb2c3d7f6bd3623bc1da96ba8
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually it got merged, so we could use regular master again

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the correct version to use at present? I am currently using 87db34de1b10b03bb2c3d7f6bd3623bc1da96ba8

@mpickering
Copy link
Contributor

I have fixed the duration timers now.

See 6f026addd1c3131c0585c15c2ebe27c23ae1baab

@alanz alanz force-pushed the rebase-ghcide-multi branch from 4773d0b to 61f364c Compare April 26, 2020 12:20
@alanz alanz merged commit 2a58af8 into haskell:master Apr 26, 2020
pepeiborra pushed a commit that referenced this pull request Dec 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants