fix: resolve conflicts

OpenAtomFoundation · Aug 25, 2024 · f7f3608 · f7f3608
1 parent 46eb978
commit f7f3608
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 0 deletions.
diff --git a/pikiwidb.conf → etc/conf/pikiwidb.conf b/pikiwidb.conf → etc/conf/pikiwidb.conf
diff --git a/build.sh → etc/script/build.sh b/build.sh → etc/script/build.sh
diff --git a/ci/build.sh → etc/script/ci/build.sh b/ci/build.sh → etc/script/ci/build.sh
diff --git a/pikiwidbtests.sh → etc/script/pikiwidbtests.sh b/pikiwidbtests.sh → etc/script/pikiwidbtests.sh
diff --git a/save_load.sh → etc/script/save_load.sh b/save_load.sh → etc/script/save_load.sh