| author | waspe <waspe> | 2003-11-03 17:56:32 (UTC) |
|---|---|---|
| committer | waspe <waspe> | 2003-11-03 17:56:32 (UTC) |
| commit | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (patch) (side-by-side diff) | |
| tree | a87bc5fa9890457809f457d82c6811835cdebe91 /core/opie-login | |
| parent | 6d7e3e8b04b63d92c61d1109c35163690f2c9948 (diff) | |
| download | opie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.zip opie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.tar.gz opie-9ce566fd5b280622670cf7b0e158f9d9c54e6e9a.tar.bz2 | |
resolved merge conflict
| -rw-r--r-- | core/opie-login/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ -202,3 +202,2 @@ int main ( int argc, char **argv ) - if ( LoginApplication::changeIdentity ( )) |