Code

Conflictos Resueltos#5

Code

Open

brian-exe wants to merge 17 commits intolecovi:masterlecovi/pcxdentro:masterfrom brian-exe:masterbrian-exe/pcxdentro:masterCopy head branch name to clipboard

+333-329

Commits

Commits on Jun 5, 2017

• Update capitulo08.md

  brian-exe

  authored
  274b806

  Copy full SHA for 274b806

• Update capitulo08.md

  brian-exe

  authored
  5932e28

  Copy full SHA for 5932e28

• Update capitulo8

  Show description for 9948629
  brian-exe

  authored
  9948629

  Copy full SHA for 9948629

Commits on Jun 12, 2017

• Create capitulo07.md

  brian-exe

  authored
  6913ef1

  Copy full SHA for 6913ef1

• Added img/f1-34a.png

  brian-exe

  authored
  78ae6f6

  Copy full SHA for 78ae6f6

• Update capitulo07.md

  brian-exe

  authored
  d74ec52

  Copy full SHA for d74ec52

• Create capitulo07.md

  culqui3482

  authored
  9c878ee

  Copy full SHA for 9c878ee

• Create capitulo07.md

  culqui3482

  authored
  71c1a4f

  Copy full SHA for 71c1a4f

• Create capitulo07.md

  culqui3482

  authored
  9d077ac

  Copy full SHA for 9d077ac

• Create capitulo07.md

  culqui3482

  authored
  8937b75

  Copy full SHA for 8937b75

• Create capitulo07.md

  culqui3482

  authored
  6a4fe1c

  Copy full SHA for 6a4fe1c

Commits on Jun 16, 2017

• Update capitulo07.md

  culqui3482

  authored
  ecd59ce

  Copy full SHA for ecd59ce

Commits on Jun 17, 2017

• Update capitulo07.md

  culqui3482

  authored
  46f1a4b

  Copy full SHA for 46f1a4b

• Update capitulo07.md

  culqui3482

  authored
  09f3c5a

  Copy full SHA for 09f3c5a

Commits on Jun 18, 2017

• Update capitulo07.md

  culqui3482

  authored
  450d307

  Copy full SHA for 450d307

Commits on Jun 26, 2017

• Removed conflicts

  brian-exe

  committed
  b457d58

  Copy full SHA for b457d58

• Removed garbage file

  brian-exe

  committed
  bc5a04c

  Copy full SHA for bc5a04c