tree c0e7c50ace0db672f89585952725e05510847244
parent b07503808f54bfc560f303063bc4be44931ee3aa
author Michael Bolin <mbolin@fb.com> 1380135623 -0700
committer Michael Bolin <mbolin@fb.com> 1380135820 -0700

Somehow some merge garbage got into the repo.
Removing so `buck test --all` works again.

This appears to have been introduced in:
https://github.com/facebook/buck/commit/e793ed7f2eb0803231264327cf29ca57756d12bd