Commit cfd18d98 authored by Romain Bignon's avatar Romain Bignon

fix strange git behavior during merge

parent d3775ec0
......@@ -20,8 +20,6 @@
from __future__ import with_statement
from __future__ import with_statement
import sys, os, tempfile
import imp, inspect
import optparse
......
......@@ -19,8 +19,6 @@
from __future__ import with_statement
from __future__ import with_statement
import subprocess
import sys
import os
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment