I hate failed merges

[pazpar2-moved-to-github.git] / src / client.h

diff --git a/src/client.h b/src/client.h
index d7cb149..7db53d6 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 2006-2009 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -34,9 +34,7 @@ enum client_state
     Client_Working,
     Client_Error,
     Client_Failed,
-    Client_Disconnected,
-    Client_Stopped,
-    Client_Continue
+    Client_Disconnected
 };
 
 int client_show_raw_begin(struct client *cl, int position,
@@ -92,7 +90,9 @@ const char *client_get_url(struct client *cl);
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+