Code

Create your own conflict#4

Code

Merged

violadelbono merged 3 commits intomastervioladelbono/merge-conflicts:masterfrom add-educationvioladelbono/merge-conflicts:add-educationCopy head branch name to clipboardMar 19, 2020

+5-4

Commits

Commits on Apr 10, 2019

• commit for education branch

  githubteacher

  committed
  b05509a

Commits on Mar 19, 2020

• Update education.yml

  violadelbono

  authored
  994da44

• Merge branch 'master' into add-education

  violadelbono

  authored
  c016dae