[Phpgroupware-cvs] sync/inc/class.so_sync.inc.php, 1.33

[nomail]

Update of /sync/inc
Modified Files:
        Branch: 
          class.so_sync.inc.php

date: 2004/05/03 08:13:18;  author: mleonhardt;  state: Exp;  lines: +6 -6

Log Message:
- reformated comment
=====================================================================
Index: sync/inc/class.so_sync.inc.php
diff -u sync/inc/class.so_sync.inc.php:1.32 sync/inc/class.so_sync.inc.php:1.33
--- sync/inc/class.so_sync.inc.php:1.32 Sun May  2 14:46:08 2004
+++ sync/inc/class.so_sync.inc.php      Mon May  3 08:13:18 2004
@@ -439,11 +439,11 @@
    /**
     * Get conflict setting for each channel from DeviceID and Source
     *
-    * results are:
-    * 1: server record wins
-    * 2: client record wins
-    * 3: duplicate
-    * 4: do nothing
+    * results are:<br>
+    * 1: server record wins<br>
+    * 2: client record wins<br>
+    * 3: duplicate (default)<br>
+    * 4: do nothing<br>
     * -1: error
     * 
     * @param integer $deviceid unique device ID for internal devices database