githubteacher / fluffy-octo-guacamole

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

demo for artificial merge conflict #299

Open edina111 opened 8 years ago