Skip to content

Conversation

@Craigfis
Copy link
Contributor

No description provided.

@bcantoni
Copy link
Contributor

Craig I notice the branch conflicts here - this branch might need rebasing again from main, and maybe that'll fix some of those typos like 'the the' which I think you fixed previously.

@seanmakesgames
Copy link
Contributor

@Craigfis what brian said. (John and I just found this PR)

Get the conflicts sorted and we'll merge it up!

@Craigfis
Copy link
Contributor Author

Craigfis commented Dec 1, 2021

If only I knew how to rebase my branch in this github web UI...

@salesforce-cla
Copy link

salesforce-cla bot commented Dec 1, 2021

Thanks for the contribution! Unfortunately we can't verify the commit author(s): Craig Fisher <c***@s***.com>. One possible solution is to add that email to your GitHub account. Alternatively you can change your commits to another email and force push the change. After getting your commits associated with your GitHub account, refresh the status of this Pull Request.

@d45
Copy link
Contributor

d45 commented Dec 1, 2021

@Craigfis Hey, Craig. I can fix the branding from Gallery to Exchange. I need to apologize, as I had this on my plate to correct for the v1.8 release. It's probably a lot easier for me to get this change. It looks like you were trying to merge directly with the main branch. We like to make the fixes in the dev branch first. If it's all right with you, I'll open a new PR to fix this in both branches. @bcantoni @seanmakesgames

Here's a new PR to merge with dev
#435

@bcantoni
Copy link
Contributor

bcantoni commented Dec 1, 2021

I'll close this one in favor of Dave's #435

@bcantoni bcantoni closed this Dec 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants