adambard/learnxinyminutes-docs — pull request #481 by levibostian (2014-01-07 14:57:35+00:00)
Title: Remove unwanted Dropbox conflict file. Sorry.

Sorry, but it looks like one of my Dropbox conflict files got merged into my last pull request.