Ugh, fix last commit.

2de88f4a · cyan · d0ad6682 · 2de88f4a
Commit 2de88f4a authored 14 years ago by cyan
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -2,11 +2,7 @@

 /* Synchronet JavaScript "global" object properties/methods for all servers */

-<<<<<<< js_global.c
 /* $Id$ */
-=======
-/* $Id$ */
->>>>>>> 1.258

 /****************************************************************************
 * @format.tab-size 4		(Plain Text/Source Code File Header)			*