Skip to content

UserLeap docs #1054

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

Merged
merged 50 commits into from
Aug 26, 2020
Merged

UserLeap docs #1054

merged 50 commits into from
Aug 26, 2020

Conversation

pauljaeinyoo
Copy link
Contributor

UserLeap docs

@pauljaeinyoo
Copy link
Contributor Author

hmm it seems like there are still conflicts
I'm at a bit of a loss, do you know how i can resolve these?

@sanscontext
Copy link
Contributor

Oooofda, I had to do a three step checkout and resolution because of how many changes had happened since you opened this branch. Sorry about that. I'm going to say, let's try to make make catalog the last thing we do as part of this process. 🙃

@sanscontext
Copy link
Contributor

Also, I had to push a bunch of stuff from master into this. 🙈 so the diff is no longer clean, sorry about that.

@pauljaeinyoo
Copy link
Contributor Author

thank you so much Laura!!

@pauljaeinyoo pauljaeinyoo merged commit 7cc24af into master Aug 26, 2020
@pauljaeinyoo pauljaeinyoo deleted the userleap-docs branch August 26, 2020 21:05
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.

6 participants