conflict fixed

2 years ago · e1e525a50d
parent fec7e7cf8d
commit e1e525a50d
4 changed files with 74895 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-zig-cache/
+zig-out
-zig-out/
+zig-cache
--- a/README.adoc
+++ b/README.adoc
@ -0,0 +1,5 @@
 = ESP MicroZig Package
 [WIP]
 SVD is copied from https://github.com/esp-rs/esp-pacs
--- a/esp32c3.svd
+++ b/esp32c3.svd
--- a/src/esp32c3.zig
+++ b/src/esp32c3.zig