From 4306099eb040f254f294dfc03136da5e50837354 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 25 Dec 2014 20:20:07 +0800 Subject: [PATCH] GUID: Fix test file.... --- t/GUID.t | 5 ----- 1 file changed, 5 deletions(-) diff --git a/t/GUID.t b/t/GUID.t index db897db56..bdb09924f 100644 --- a/t/GUID.t +++ b/t/GUID.t @@ -17,17 +17,12 @@ ddg_goodie_test([qw( DDG::Goodie::GUID ) ], 'uuid' => test_zci(@answer), 'globally unique identifier' => test_zci(@answer), 'rfc 4122' => test_zci(@answer), -<<<<<<< HEAD 'new guid' => test_zci(@answer), 'random uuid' => test_zci(@answer), 'generate new uuid' => test_zci(@answer), 'generate random uuid' => test_zci(@answer), 'uuid in ansi C' => undef, 'what is a guid' => undef, -======= - 'uuid in ansi C' => undef, - 'what is a guid' => undef, ->>>>>>> parent of 91e48e9... GUID: Add additonal triggers ); done_testing;