Merge branch 'prestonmcgowan-master' sans the mapping snippet

# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
paxtonhare · Sep 10, 2014 · a3a6e34 · a3a6e34
1 parent 9c0fa2b
commit a3a6e34
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/snippets/mapping.sublime-snippet b/snippets/mapping.sublime-snippet