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

Advanced Conflicts #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions _data/experience.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
# Jobs
# Shoptocat
# Trainer
- company: GitHub, Inc.
position: Shoptocat
duration: March, 2013 — Present
summary: Create awesome swag, ensure orders get delivered quickly, collect all the stickers.
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
position: Web Developer
duration: May, 2014 — May, 2015
summary: Web developer for a restuarant meat provider.


# Supportocat
- company: GitHub, Inc.
position: Supportocat, GitHub for Business
duration: October 2016 — Present
summary: Provide amazing support to customers on the GitHub for Business platform
duration: June 2016 — Present
summary: Provide world class support to customers on the GitHub for Business platform
6 changes: 3 additions & 3 deletions _data/interests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Interests
- description: Travel
- description: Animated cartoons involving restuarants and burgers
- description: Amusement parks
- description: Electron, Atom, GraphQL, Webhooks, and most of all... Git
- description: Movies about a cappella singing
- description: Anaheim Theme Parks