Fix merge conflict.

codeeu · Oct 17, 2016 · 4ff338c · 4ff338c
1 parent 6a18d84
commit 4ff338c
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 48 deletions.
diff --git a/resources/docs/DGD-Scratch-Teacher-Guide-Abrdgd.pdf b/resources/docs/DGD-Scratch-Teacher-Guide-Abrdgd.pdf