githubteacher / fluffy-octo-guacamole

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

Creating an arbitray merge conflict. #297

Open benjaminestes opened 8 years ago