Home Explore Help
Sign In
zorun
/
kea
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[trac1113] fix conflict in src/lib/dns/Makefile.am

chenzhengzhang 13 years ago
parent
deefb84c32
commit
d72e84456e
1 changed files with 0 additions and 3 deletions
Split View Show Diff Stats
  1. 0 3
      src/lib/dns/Makefile.am

+ 0 - 3
src/lib/dns/Makefile.am
View File 

@@ -51,13 +51,10 @@ EXTRA_DIST += rdata/generic/soa_6.cc
 
 EXTRA_DIST += rdata/generic/soa_6.h
 
 EXTRA_DIST += rdata/generic/txt_16.cc
 
 EXTRA_DIST += rdata/generic/txt_16.h
 
-<<<<<<< HEAD
 
 EXTRA_DIST += rdata/generic/minfo_14.cc
 
 EXTRA_DIST += rdata/generic/minfo_14.h
 
-=======
 
 EXTRA_DIST += rdata/generic/afsdb_18.cc
 
 EXTRA_DIST += rdata/generic/afsdb_18.h
 
->>>>>>> master
 
 EXTRA_DIST += rdata/hs_4/a_1.cc
 
 EXTRA_DIST += rdata/hs_4/a_1.h
 
 EXTRA_DIST += rdata/in_1/a_1.cc