Rebase EGM changes onto Master.

Reporter: JoshDreamland  |  Status: open  |  Last Modified: July 14, 2019, 02:12:23 PM

Attempts to re-apply EGM changes to Master. GMX changes made in that branch are not included unless they magically had no conflicts.
RobertBColton  
@JoshDreamland ah, I just remembered why you had GMX changes in there. The egmcrap branch was based on #1479 or else fundies threatened me to merge it into it. If that's true, I am not sure you can necessarily just throw those commits away without replacing them with something else. Regardless, if we want #1479 then we also need to fix its conflicts.
fundies  

@RobertBColton idk wtf going on with this pr it has some sort of ghost. I don't see any conflicts in my repo when I go to pull it as a new pr to here but updating josh's it just says theres a conflict every time...
RobertBColton  

@fundies look at it in the web editor. It's just whitespace.
Resolve Conflicts
Whitespace Conflicts

RobertBColton  

@fundies Does 563a4a2 look ok?
fundies  

I fixed it in my branch. Can you just use webui n fix so we can get this merged
Please sign in to post comments, or you can view this issue on GitHub.