r15005@catbus: nickm | 2007-09-10 09:49:03 -0400

Undo brokenness from merge conflict.


svn:r11414

src/or/ntmain.c

@@ -762,4 +762,3 @@ nt_service_parse_options(int argc, char **argv, int *should_exit)
   return 0;
 }
 
-

src/or/or.h

@@ -3025,6 +3025,7 @@ void do_hash_password(void);
 int tor_init(int argc, char **argv);
 #endif
 
+/********************************* ntmain.c ***************************/
 #ifdef MS_WINDOWS
 #define NT_SERVICE
 #endif