Merge pull request #74 from pavelbinar/master

Fix monocle/app.py code merge error
nylas · Aug 13, 2014 · e4eda7a · e4eda7a
2 parents 59be24e + e5bf402
commit e4eda7a
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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