Index: /trunk/avahi-core/server.c

===================================================================

--- /trunk/avahi-core/server.c (revision 1463)

+++ /trunk/avahi-core/server.c (revision 1496)

@@ -611,9 +611,7 @@

             }

-            if (handle_conflict(s, i, record, unique)) {

-                avahi_response_scheduler_suppress(i->response_scheduler, record, a);

-                avahi_record_list_drop(s->record_list, record);

-                avahi_cache_stop_poof(i->cache, record, a);

-            }

+            avahi_response_scheduler_suppress(i->response_scheduler, record, a);

+            avahi_record_list_drop(s->record_list, record);

+            avahi_cache_stop_poof(i->cache, record, a);

             avahi_record_unref(record);