diff options
| -rw-r--r-- | scumm/string.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 5f39617eee..dee0c92e54 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -16,11 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -<<<<<<< string.cpp * $Header$ -======= - * $Header$ ->>>>>>> 1.153 * */ |