From a8b31060a0fe668b36d0dceb83c2b1a7621ab988 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 3 Apr 2014 10:27:04 -0400
Subject: stop using use_ok

---
 t/merge.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 't/merge.t')

diff --git a/t/merge.t b/t/merge.t
index 465fa50..074efaf 100644
--- a/t/merge.t
+++ b/t/merge.t
@@ -5,7 +5,7 @@ use Test::More;
 use lib 't/lib/merge';
 
 {
-    use_ok('Foo::Conflicts');
+    require Foo::Conflicts;
     is_deeply(
         { Foo::Conflicts->conflicts },
         {
-- 
cgit v1.2.3-54-g00ecf