fix: merged conflicts

okTurtles · Feb 15, 2024 · 9bbd342 · 9bbd342
2 parents 1eb7c74 + 52a5ac3
commit 9bbd342
Show file tree

Hide file tree

Showing 18 changed files with 61,638 additions and 44 deletions.
diff --git a/contracts/0.2.1/chatroom-slim.js b/contracts/0.2.1/chatroom-slim.js
diff --git a/contracts/0.2.1/chatroom.0.2.1.manifest.json b/contracts/0.2.1/chatroom.0.2.1.manifest.json
@@ -0,0 +1 @@
+{"head":"{\"manifestVersion\":\"1.0.0\"}","body":"{\"version\":\"0.2.1\",\"contract\":{\"hash\":\"z9brRu3VHhmzZaiMNnxEuewZNDgoi7UPJVCaWV4iXZKD3zr5HEHu\",\"file\":\"chatroom.js\"},\"signingKeys\":[\"[\\\"edwards25519sha512batch\\\",\\\"pwGi5/2WsmLslzRRUHTdzn0Plpcd3Rw42WnDNXGPpsE=\\\",null]\"],\"contractSlim\":{\"file\":\"chatroom-slim.js\",\"hash\":\"z9brRu3VVgoWjRPeWTfoExGHJWpzVjYkcvuSeFnjt8VAwuxHeYiF\"}}","signature":{"keyId":"z2Drjgb9b7A8hNdkyHzo81XbNEcMZLghdZNp9G9kBR9QgyrU5Lx","value":"jG+Pvhy9wXzqlWvn0defG+fnInfEpp0rjdmV2EwYXMQJM7J8JZwnwTzmc111zSsp6RjsXYosnWrSaaMKsB/tBA=="}}
diff --git a/contracts/0.2.1/chatroom.js b/contracts/0.2.1/chatroom.js
diff --git a/contracts/0.2.1/group-slim.js b/contracts/0.2.1/group-slim.js
diff --git a/contracts/0.2.1/group.0.2.1.manifest.json b/contracts/0.2.1/group.0.2.1.manifest.json
@@ -0,0 +1 @@
+{"head":"{\"manifestVersion\":\"1.0.0\"}","body":"{\"version\":\"0.2.1\",\"contract\":{\"hash\":\"z9brRu3VMg5SyEUGdtk1nspdaPhE4L5iNqJ5HZAvEZrTQXdpaL7o\",\"file\":\"group.js\"},\"signingKeys\":[\"[\\\"edwards25519sha512batch\\\",\\\"pwGi5/2WsmLslzRRUHTdzn0Plpcd3Rw42WnDNXGPpsE=\\\",null]\"],\"contractSlim\":{\"file\":\"group-slim.js\",\"hash\":\"z9brRu3VRbGJFjrKd7rLG555FWS24Sgj1wzchsaA2CDDV6t2RkbH\"}}","signature":{"keyId":"z2Drjgb9b7A8hNdkyHzo81XbNEcMZLghdZNp9G9kBR9QgyrU5Lx","value":"pl8h9eHpDtKIlWyupmUjlHDwaBv0sx6hjDZd58z9NlRce8s37pAI0e1uTOYlSqwgc2ZAVc8yfjXQwm8/dO67BA=="}}
diff --git a/contracts/0.2.1/group.js b/contracts/0.2.1/group.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"head":"{\"manifestVersion\":\"1.0.0\"}","body":"{\"version\":\"0.2.1\",\"contract\":{\"hash\":\"z9brRu3VHhmzZaiMNnxEuewZNDgoi7UPJVCaWV4iXZKD3zr5HEHu\",\"file\":\"chatroom.js\"},\"signingKeys\":[\"[\\\"edwards25519sha512batch\\\",\\\"pwGi5/2WsmLslzRRUHTdzn0Plpcd3Rw42WnDNXGPpsE=\\\",null]\"],\"contractSlim\":{\"file\":\"chatroom-slim.js\",\"hash\":\"z9brRu3VVgoWjRPeWTfoExGHJWpzVjYkcvuSeFnjt8VAwuxHeYiF\"}}","signature":{"keyId":"z2Drjgb9b7A8hNdkyHzo81XbNEcMZLghdZNp9G9kBR9QgyrU5Lx","value":"jG+Pvhy9wXzqlWvn0defG+fnInfEpp0rjdmV2EwYXMQJM7J8JZwnwTzmc111zSsp6RjsXYosnWrSaaMKsB/tBA=="}}