commit c3dc14d19a1036fa8a600cb07bb47387d429eda8
author Anton Blanchard <anton@linux.ibm.com> Thu Nov 24 20:27:23 2022 +1100
committer Anton Blanchard <anton@ozlabs.org> Thu Nov 24 20:27:23 2022 +1100
tree 618e808dfdf08bacbbec9df6b1c10065c22474ea
parent beaa352dd6b6a4fe8496b19ec9c86d96610ea690

Fix merge issue

verilog/rtl/user_defines.v

diff --git a/verilog/rtl/user_defines.v b/verilog/rtl/user_defines.v
index 6a586df..11169e0 100644
--- a/verilog/rtl/user_defines.v
+++ b/verilog/rtl/user_defines.v
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-FileCopyrightText: 2020 Efabless Corporation
-=======
 // SPDX-FileCopyrightText: 2022 Efabless Corporation
->>>>>>> remotes/efabless/main
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.