Code

Lab resolving git conflicts#42

Code

Open

rzrodriguez wants to merge 4 commits intoironhack-labs:masterironhack-labs/data-labs:masterfrom rzrodriguez:lab-resolving-git-conflictsrzrodriguez/data-labs:lab-resolving-git-conflictsCopy head branch name to clipboard

+31-4

Commits

Commits on Jul 1, 2019

• adding git-fu file

  rzrodriguez

  committed
  40ccfb0

  Copy full SHA for 40ccfb0

• alteracao no aboutme

  rzrodriguez

  committed
  aa5828d

  Copy full SHA for aa5828d

• introducing myself

  rzrodriguez

  committed
  e1b2510

  Copy full SHA for e1b2510

• resolving conflicts with master branch

  rzrodriguez

  committed
  e511eab

  Copy full SHA for e511eab