# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2010-08-26 20:51:48
# Node ID 81c4e18c7ceef6638249f8b03fb5c7679266bace
# Parent  b10b07a821c36e5b0a8cf83f93b117767523315b

simplemerge: remove hash-bang from non-executable script

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (C) 2004, 2005 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify