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

[master] removed garbage line (that had to be removed in the previous change)

JINMEI Tatuya 14 years ago
parent
ffa2f06720
commit
4c178871eb
1 changed files with 0 additions and 1 deletions
Split View Show Diff Stats
  1. 0 1
      src/lib/dns/tests/tsigrecord_unittest.cc

+ 0 - 1
src/lib/dns/tests/tsigrecord_unittest.cc
View File 

@@ -104,7 +104,6 @@ TEST_F(TSIGRecordTest, fromParams) {
 
     // Unexpected TTL (simply ignored)
 
     EXPECT_NO_THROW(TSIGRecord(test_name, TSIGRecord::getClass(),
 
                                RRTTL(3600), test_rdata, 85));
 
->>>>>>> trac813
 
 }
 
 
 TEST_F(TSIGRecordTest, recordToWire) {