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.

Sign up for GitHub

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

Jump to bottom

fix for deprecation #96

Merged
merged 1 commit into from
Apr 6, 2021
Merged

fix for deprecation #96

merged 1 commit into from
Apr 6, 2021

Conversation

sequencer
Copy link
Contributor

No description provided.

@hngenc hngenc changed the base branch from master to dev April 5, 2021 04:45
@hngenc
Copy link
Member

hngenc commented Apr 5, 2021

Thank you for the PR! I've changed the target branch from master to dev. Can you try fixing the merge conflicts that were caused by that? I would fix them myself, but I don't think I can edit your fork.

Fixing the DMAReadCommandTracker.scala conflict should be easy; DMAReadCommandTracker.scala was simply renamed to DMACommandTracker.scala. I'm guessing that's where the merge conflict arose from.

@sequencer
Copy link
Contributor Author

@hngenc Done :)

hngenc
hngenc approved these changes Apr 6, 2021
View reviewed changes
Copy link
Member

@hngenc hngenc left a comment

Choose a reason for hiding this comment

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

lgtm

@hngenc hngenc merged commit dd63135 into ucb-bar:dev Apr 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hngenc hngenc hngenc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@sequencer @hngenc