[2013] removed garbaged introduced in rebasing

diff --git a/src/lib/python/isc/ddns/libddns_messages.mes b/src/lib/python/isc/ddns/libddns_messages.mes
index 5586a8330d5d08faca9d811fa89089582bfd80e8..b82bac8026b3dee833e5e4cd4072aa8e0116c156 100644 (file)
--- a/src/lib/python/isc/ddns/libddns_messages.mes
+++ b/src/lib/python/isc/ddns/libddns_messages.mes
@@ -104,9 +104,6 @@ RRset exists (value independent).  At least one RR with a
 specified NAME and TYPE (in the zone and class specified by
 the Zone Section) must exist.
 
-=======
->>>>>>> 644c706... [1458] cleanup: reorder log message files
-
 % LIBDDNS_UPDATE_APPROVED update client %1 for zone %2 approved
 Debug message.  An update request was approved in terms of the zone's
 update ACL.