commit 37c0e4e888416a6d0433a23a164c5bd565c357ca Author: Isis Lovecruft <isis@patternsinthevoid.net> Date: Thu May 31 12:36:50 2012 -0300 Fixed module import issues with directory structure. --- ooni/plugoo/reports.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/ooni/plugoo/reports.py b/ooni/plugoo/reports.py index a6b0ac9..ef15a04 100644 --- a/ooni/plugoo/reports.py +++ b/ooni/plugoo/reports.py @@ -4,11 +4,7 @@ import os import yaml import itertools -<<<<<<< HEAD import log -======= -from ooni.utils import log, date, net ->>>>>>> * Fix some bugs in Daphn3 class Report: """This is the ooni-probe reporting mechanism. It allows