Browse Source

[master] Remove conflict marker, fix object ID

Jeremy C. Reed 14 years ago
parent
commit
5291193576
1 changed files with 1 additions and 2 deletions
  1. 1 2
      ChangeLog

+ 1 - 2
ChangeLog

@@ -2,7 +2,7 @@
 	Add stop interface into dns server, so we can stop each running
 	server individually. With it, user can reconfigure her running server
 	with different ip address or port.
-	(Trac #388, git ba727c17d3517232a3c40fa3a30c6924a30ed7dc)
+	(Trac #388, git 6df94e2db856c1adc020f658cc77da5edc967555)
 
   180.  [build]     jreed
 	Fix custom DESTDIR for make install.
@@ -57,7 +57,6 @@ bind10-devel-20110224 released on February 24, 2011
 	list and map item addressing, the correct display of actual values,
 	and internal help.
 	(Trac #384, git e5fb3bc1ed5f3c0aec6eb40a16c63f3d0fc6a7b2)
->>>>>>> master
 
   171.  [func]      feng, jerry, jinmei, vorner
 	b10-auth, src/lib/datasrc: in memory data source now works as a