Code

minhas alteracoes todas lindas#5

Code

Open

flaviamorim wants to merge 9 commits intoMariaLabHackerspace:masterMariaLabHackerspace/oficina-git:masterfrom flaviamorim:masterflaviamorim/oficina-git:masterCopy head branch name to clipboard

+31

Commits

Commits on Oct 29, 2016

• novos arquivos atualizados

  flaviamorim

  committed
  8784ebd

  Copy full SHA for 8784ebd

• alteracao no arquivo html concluida

  flaviamorim

  committed
  f9f3a03

  Copy full SHA for f9f3a03

• alteracoes para arquivo branch

  flaviamorim

  committed
  e2d4456

  Copy full SHA for e2d4456

• realizei alteracoes

  flaviamorim

  committed
  d35953c

  Copy full SHA for d35953c

• alteracao pra ver se aparece o negocinho

  flaviamorim

  committed
  c01cffe

  Copy full SHA for c01cffe

• erro em mesclar

  flaviamorim

  committed
  937384f

  Copy full SHA for 937384f

• pra testar merge

  flaviamorim

  committed
  59e174b

  Copy full SHA for 59e174b

• mensagem para conflito\merge

  flaviamorim

  committed
  669125b

  Copy full SHA for 669125b

• testando conflito no merge

  flaviamorim

  committed
  f2c4232

  Copy full SHA for f2c4232