From e5bf402b794a3641f22291110e32f4352da7e1fc Mon Sep 17 00:00:00 2001 From: Pavel Binar Date: Wed, 13 Aug 2014 20:37:07 +0200 Subject: [PATCH] Fix monocle/app.py code merge error --- inbox/monocle/app.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/inbox/monocle/app.py b/inbox/monocle/app.py index d2d5146b9..276c39322 100755 --- a/inbox/monocle/app.py +++ b/inbox/monocle/app.py @@ -1,9 +1,6 @@ #!/usr/bin/python -<<<<<<< HEAD import platform from subprocess import call -======= ->>>>>>> fd32cd43396ccb4a0b5714bc6a7790b9f33b0943 import json import datetime from collections import defaultdict