chore: rearrange files, repair merge conflict

Agoric · Feb 13, 2024 · 0429a58 · 0429a58
1 parent 1d12d6c
commit 0429a58
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 31 deletions.
diff --git a/.../b:upgrade-14/invite-submission/README.md → ...:upgrade-next/invite-submission/README.md b/.../b:upgrade-14/invite-submission/README.md → ...:upgrade-next/invite-submission/README.md
@@ -9,8 +9,4 @@ proposal is required to be in a file, so we have to edit a template file
 (sendInvite.template.js) to produce the .js file that will be submitted.
 
 The core-eval is invoked from the test, which then verifies that the details
-<<<<<<< HEAD:a3p-integration/proposals/b:upgrade-14/invite-submission/README.md
 were written to vstorage.
-=======
-were written to vstorage.
->>>>>>> d46546de4 (chore: helpful suggestions from review):a3p-integration/proposals/a:upgrade-14/invite-submission/README.md
diff --git a/.../invite-submission/sendInvite-permit.json → .../invite-submission/sendInvite-permit.json b/.../invite-submission/sendInvite-permit.json → .../invite-submission/sendInvite-permit.json
diff --git a/.../invite-submission/sendInvite.template.js → .../invite-submission/sendInvite.template.js b/.../invite-submission/sendInvite.template.js → .../invite-submission/sendInvite.template.js
diff --git a/...on/proposals/b:upgrade-14/repairs.test.js → .../proposals/a:upgrade-next/repairs.test.js b/...on/proposals/b:upgrade-14/repairs.test.js → .../proposals/a:upgrade-next/repairs.test.js
diff --git a/a3p-integration/proposals/b:upgrade-14/package.json b/a3p-integration/proposals/b:upgrade-14/package.json
diff --git a/a3p-integration/proposals/b:upgrade-14/test.sh b/a3p-integration/proposals/b:upgrade-14/test.sh