Browse Source

[2013] removed garbaged introduced in rebasing

JINMEI Tatuya 13 years ago
parent
commit
23e49e12b9
1 changed files with 0 additions and 3 deletions
  1. 0 3
      src/lib/python/isc/ddns/libddns_messages.mes

+ 0 - 3
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
 specified NAME and TYPE (in the zone and class specified by
 the Zone Section) must exist.
 the Zone Section) must exist.
 
 
-=======
->>>>>>> 644c706... [1458] cleanup: reorder log message files
-
 % LIBDDNS_UPDATE_APPROVED update client %1 for zone %2 approved
 % LIBDDNS_UPDATE_APPROVED update client %1 for zone %2 approved
 Debug message.  An update request was approved in terms of the zone's
 Debug message.  An update request was approved in terms of the zone's
 update ACL.
 update ACL.