githubteacher / fluffy-octo-guacamole

demo and practice repo for May 2016 GitHub for Developers class
14 stars 15 forks source link

Demo merge conflicts, learning to solve them #292

Open lecano opened 8 years ago