Skip to content
This repository was archived by the owner on Aug 13, 2019. It is now read-only.

[WIP Don't merge this yet] Create pre-existing conflicts #3

Open
githubteacher wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP Don't merge this yet] Create pre-existing conflicts #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions _data/experience.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
# Jobs
# Shoptocat
# Teacher
- company: GitHub, Inc.
position: Shoptocat
position: GitHub Teacher
duration: March, 2013 — Present
summary: Create awesome swag, ensure orders get delivered quickly, collect all the stickers.
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