Merge pull request #4 from KathrynBaker/add-experience

Advanced Conflicts
KathrynBaker · Jun 19, 2018 · 9ef842f · 9ef842f
2 parents dc84398 + c5a1660
commit 9ef842f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/_data/experience.yml b/_data/experience.yml
@@ -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 &mdash; Present
+  summary: Teach all things Git, give away all the stickers, ensure world peace.
 
 # Job Title
 - company: Conway Meats

diff --git a/_data/interests.yml b/_data/interests.yml
@@ -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