diff --git a/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes b/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes
index b4ed40fa..365b8b44 100644
--- a/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes
+++ b/CASA-auth-token/client/package/linux/CASA_auth_token_client.changes
@@ -17,7 +17,6 @@ Mon Feb 12 11:58:41 CET 2007 - aj@suse.de
 - Remove unneeded dependency on glade-sharp.
 
 -------------------------------------------------------------------
->>>>>>> .r1199
 Wed Feb  7 16:02:39 MST 2007 - jluciani@novell.com
 
 - Resolved Bugs 242890, 242893, 242894, 242895, 242896, 242898,