| commit | 108ea5601f5a271b1fbb9fc6b7caf7c05cd85e7a | [log] [tgz] |
|---|---|---|
| author | manarabdelaty <manarabdelaty> | Mon Dec 28 18:28:46 2020 +0200 |
| committer | manarabdelaty <manarabdelaty> | Mon Dec 28 18:28:46 2020 +0200 |
| tree | e9d2053cca565768aa5208e8a734c2a37453d7b7 | |
| parent | f48448d4736bd6d56fed4dbf7f9cc50552d8745d [diff] | |
| parent | 93dbd5ddbd74afecd9d138df0b323ae5fc93b0d6 [diff] |
Merge branch 'main' of https://github.com/shalan/Caravel_N5_SoC
diff --git a/README.md b/README.md index 15727b1..8b65b0d 100644 --- a/README.md +++ b/README.md
@@ -1,3 +1,4 @@ +<<<<<<< HEAD <!--- # SPDX-FileCopyrightText: 2020 Efabless Corporation # @@ -147,3 +148,6 @@ [0]: openlane/README.md [1]: mpw-one-b.md +======= +# Caravel_N5_SoC +>>>>>>> 93dbd5ddbd74afecd9d138df0b323ae5fc93b0d6