Delete 3-1 (farley-netbook-crunchbang's conflicted copy 2013-07-10).c

This is a junk file left over from a vim crash.