Fix conflicts on last-modified dates

Alex Smith · Alex Smith · commit 1876dca6d85b · 2011-08-19T17:44:25.000+01:00
Ignore-this: c358ee37be951b7d75360d3119ea16f1

darcs-hash:20110819164425-99289-aaa3c2518b6137dcaefc14e416af2cc1547b3a59
diff --git a/src/apply.c b/src/apply.c
@@ -1,6 +1,6 @@
 /*	SCCS Id: @(#)apply.c	3.4	2003/11/18	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
-/* Modified 16 Jun 2011 by Alex Smith */
+/* Modified 19 Aug 2011 by Alex Smith */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
diff --git a/src/do_name.c b/src/do_name.c
@@ -1,6 +1,6 @@
 /*	SCCS Id: @(#)do_name.c	3.4	2003/01/14	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
-/* Modified 30 Mar 2011 by Alex Smith */
+/* Modified 30 Jul 2011 by Alex Smith */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
diff --git a/src/eat.c b/src/eat.c
@@ -1,6 +1,6 @@
 /*	SCCS Id: @(#)eat.c	3.4	2003/02/13	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
-/* Modified 1 Jul 2011 by Alex Smith */
+/* Modified 19 Aug 2011 by Alex Smith */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
diff --git a/src/mthrowu.c b/src/mthrowu.c
@@ -1,6 +1,7 @@
 /*	SCCS Id: @(#)mthrowu.c	3.4	2003/05/09	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
-/* Modified 17 Jun 2011 by Alex Smith */
+/* Modified 19 Aug 2011 by Alex Smith */
+
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
