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

Create your own conflict #4

Merged
merged 3 commits into from
Mar 19, 2020
Merged

Create your own conflict #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b05509a
commit for education branch
githubteacher Apr 10, 2019
994da44
Update education.yml
violadelbono Mar 19, 2020
c016dae
Merge branch 'master' into add-education
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
9 changes: 5 additions & 4 deletions _data/education.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Degree
- degree: Full Stack Webdeveloper Nanodegree
uni: Udacity
year: June, 2014 — January, 2015

degree: Full Stack
uni:BLABLA
year: June, 2000 — January, 2020
awards: Most Dedicated Student per Optional Activities Completed
summary: Spent 6 dedicated months working 12 hour days to build out multiple real world apps and websites.
summary: ciao