Lab resolving git conflicts#58

Open

MelineM wants to merge 36 commits intoironhack-labs:masterfrom

MelineM:lab-resolving-git-conflicts

Commits on May 13, 2019

Commits on May 22, 2019

Merge pull request #10 from ironhack-labs/master
ta-data-par
authored

Commits on Jun 13, 2019

Merge pull request #11 from ironhack-labs/master
ta-data-par
authored

Commits on Jul 15, 2019

Merge pull request #13 from ironhack-labs/master
ta-data-par
authored

Commits on Oct 14, 2019

made a change

Meliné Minassian
authored and
Meliné Minassian
committed
added my into

Meliné Minassian
authored and
Meliné Minassian
committed
correct file added

Meliné Minassian
authored and
Meliné Minassian
committed