From: Jean THOMAS <git0@pub.jeanthomas.me>
Date: Wed, 1 Jul 2020 18:09:56 +0000 (+0200)
Subject: Fix merge
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4c8d7b18facc16b751cd99d36edcb92648f1e36d;p=gram.git

Fix merge
---

4c8d7b18facc16b751cd99d36edcb92648f1e36d
diff --cc gram/simulation/simsoctb.v
index 4ca4b9d,efdf7f2..512a874
--- a/gram/simulation/simsoctb.v
+++ b/gram/simulation/simsoctb.v
@@@ -1,6 -1,6 +1,6 @@@
  // This file is Copyright (c) 2020 LambdaConcept <contact@lambdaconcept.com>
  
--`timescale 1 ns / 100 ps
++`timescale 1 ns / 1 ns
  
  module simsoctb;
    //parameter simticks = 70000;