From 9acb352cf64b3454fa114f1072d141dc80310100 Mon Sep 17 00:00:00 2001
From: mwachs5 <megan@sifive.com>
Date: Wed, 21 Sep 2016 20:02:01 -0700
Subject: [PATCH] Correct Merge Conflitct -- clock, not clk (#327)

I think there was a merge conflict somewhere. This should be 'clock', not 'clk'
---
 vsrc/TestDriver.v | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vsrc/TestDriver.v b/vsrc/TestDriver.v
index 5ee28e41..11102bf0 100644
--- a/vsrc/TestDriver.v
+++ b/vsrc/TestDriver.v
@@ -9,7 +9,7 @@ module TestDriver;
   reg clock = 1'b0;
   reg reset = 1'b1;
 
-  always #(`CLOCK_PERIOD/2.0) clk = ~clk;
+  always #(`CLOCK_PERIOD/2.0) clock = ~clock;
   initial #(`RESET_DELAY) reset = 0;
 
   // Read input arguments and initialize