From 72290f67fee2be183981c9672d830040466187bd Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Sun, 14 Dec 2014 20:57:29 +0000
Subject: resolve merge conflict hell

---
 ethereum | Bin 16025932 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 ethereum

(limited to 'ethereum')

diff --git a/ethereum b/ethereum
deleted file mode 100755
index 7e17d95a4..000000000
Binary files a/ethereum and /dev/null differ
-- 
cgit v1.2.3