Commit c48ae350 authored by Gaute Hope's avatar Gaute Hope

Merge branch 'master' into freebsd

Conflicts:
	src/at.py
parents 08fe39d0 57ca40f7
......@@ -590,7 +590,7 @@ fi
script = script[scriptstart:]
if stdlocale:
script = script[self.PREPEND_SCRIPT_LINES:]
script = script[self.PREPEND_SCRIPT_LINES:]
if manual_poscorrect == True:
scriptstart = script.find (self.POSIXLY_CORRECT_UNSET)
......
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