From 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Mon, 03 Nov 2003 17:56:32 +0000
Subject: resolved merge conflict

---
(limited to 'core/opie-login')

diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 2103216..5ecde1e 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -200,7 +200,6 @@ int main ( int argc, char **argv )
                 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
                 LoginApplication::setLoginAs ( autolog );
 
-
 				if ( LoginApplication::changeIdentity ( ))
 					::exit ( LoginApplication::login ( ));
 				else
--
cgit v0.9.0.2