Merge remote-tracking branch 'origin/master'

amigrave · amigrave · commit 973161eccb9e · 2014-06-17T14:21:32.000+02:00
diff --git a/git_qdiff.py b/git_qdiff.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 import os
 from os.path import join as opj

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#!/usr/bin/env python2`
`2`	`1`	`# -- coding: utf-8 --`
`3`	`2`	`import os`
`4`	`3`	`from os.path import join as opj`