[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r322171 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon Jun  6 22:56:58 2011
New Revision: 322171

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322171
Log:
Fix Conflict on app_queue

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/apps/app_queue.c

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun  6 22:56:58 2011
@@ -1,1 +1,1 @@
-/trunk:1-322083
+/trunk:1-322170

Modified: team/irroot/distrotech-customers-trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/apps/app_queue.c?view=diff&rev=322171&r1=322170&r2=322171
==============================================================================
--- team/irroot/distrotech-customers-trunk/apps/app_queue.c (original)
+++ team/irroot/distrotech-customers-trunk/apps/app_queue.c Mon Jun  6 22:56:58 2011
@@ -2095,7 +2095,7 @@
  * \brief Find rt member record to update otherwise create one.
  *
  * Search for member in queue, if found update penalty/paused state,
- * if no member exists create one flag it as a RT member and add to queue member list. 
+ * if no member exists create one flag it as a RT member and add to queue member list.
 */
 static void rt_handle_member_record(struct call_queue *q, char *interface, struct ast_config *member_config)
 {