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

Advanced Conflicts #4

Merged
merged 3 commits into from
Jun 19, 2018
Merged

Advanced Conflicts #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9f70eb
Add Training and update support experience
githubteacher Feb 21, 2018
c0fceb9
Add GitHub Teacher interests
githubteacher Feb 21, 2018
c5a1660
Merge branch 'master' into add-experience
KathrynBaker Jun 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions _data/experience.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Jobs
# Surftocat
- company: Self Employed
position: Surftocat
duration: Life
summary: I only live to get radical.
# Trainer
- company: GitHub, Inc.
position: GitHub Trainer
duration: March, 2012 — Present
summary: Teach all things Git, give away all the stickers, ensure world peace.

# Job Title
- company: Conway Meats
Expand Down
8 changes: 3 additions & 5 deletions _data/interests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# Interests
<<<<<<< HEAD
- description: Electron, Atom, GraphQL, Webhooks, and most of all... Git
- description: Movies about a cappella singing
- description: Anaheim Theme Parks
- description: Travel
- description: Animated cartoons involving restuarants and burgers
- description: Amusement parks

=======
- description: Open Source
- description: Empowering underrepresented groups in tech through education and free events.
- description: French Horn

>>>>>>> add-that-french-horn-branch