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

More conflicts #3

Merged
merged 2 commits into from
Mar 19, 2020
Merged

More conflicts #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
806f4a5
add experience
githubteacher Apr 10, 2019
a9e1533
Merge branch 'master' into add-experience
violadelbono Mar 19, 2020
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
14 changes: 9 additions & 5 deletions _data/experience.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
# Jobs

# Surftocat
- company: Self Employed
position: Surftocat
duration: Life
summary: I only live to get radical.


# Job Title
- company: Conway Meats
position: Web Developer
duration: May, 2014 — May, 2015
summary: Web developer for a restuarant meat provider.

# Intern
- company: GitHub
position: Intern - Web Developer - Designer
duration: June, 2017 — August, 2017
summary: Redesigned the services.github.com website without a calendar
# Supportocat
- company: GitHub, Inc.
position: Supportocat, GitHub for Business
duration: June 2016 — Present
summary: Provide world class support to customers on the GitHub for Business platform


10 changes: 4 additions & 6 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: 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

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

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