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

Updating bRealTime to EMX Digital #877

Closed
wants to merge 3 commits into from
Closed

Updating bRealTime to EMX Digital #877

wants to merge 3 commits into from

Conversation

ncolletti
Copy link
Contributor

@bretg
Copy link
Contributor

bretg commented Jul 11, 2018

Which PR? Please resolve conflicts.

@ncolletti
Copy link
Contributor Author

@ncolletti
Copy link
Contributor Author

@bretg this did not show conflicts when I merged and doesn't show when I pull on my remote forked branch. We are simply renaming the brealtime.md file to emxdigital and renaming the assets in there as per the commit in this branch, no other changes. Let me know.

@bretg
Copy link
Contributor

bretg commented Aug 2, 2018

I fixed this for you. Closing this one in favor of #915

@bretg bretg closed this Aug 2, 2018
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.

2 participants