manual merge, fix minor import issue

This commit is contained in:
Jonathan Warren 2013-07-14 17:10:37 -04:00
parent e82a8aead3
commit 3a06edbbd8

View File

@ -22,7 +22,6 @@ import time
# Project imports. # Project imports.
from addresses import * from addresses import *
from debug import logger
import highlevelcrypto import highlevelcrypto
import shared import shared
import helper_startup import helper_startup