Code

Create Your Own Conflict#3

Code

Merged

KathrynBaker merged 4 commits intomasterKathrynBaker/merge-conflict:masterfrom add-educationKathrynBaker/merge-conflict:add-educationCopy head branch name to clipboardJun 19, 2018

+5-5

Commits

Commits on Feb 23, 2018

• Empty commit to allow PR to be created

  hollenberry

  committed
  88257e9

  Copy full SHA for 88257e9

• Adding spaces for easy edit in PR files changed

  hollenberry

  committed
  2f51b5e

  Copy full SHA for 2f51b5e

Commits on Jun 19, 2018

• Update education.yml

  KathrynBaker

  authored
  d83cb1f

  Copy full SHA for d83cb1f

• Merge branch 'master' into add-education

  KathrynBaker

  authored
  ccfe02e

  Copy full SHA for ccfe02e