Resolved conflict in service/ghosties

Signed-off-by: Metanomad <root@vmi2223076.contaboserver.net>
metanomad
2025-12-27 11:19:57 +00:00 · 2024-10-31 23:34:51 +01:00 · 2024-10-31 23:27:55 +01:00 · 2024-10-31 21:58:16 +01:00 · 2024-10-28 19:45:54 +01:00
1 changed files with 21 additions and 9 deletions
--- a/service/ghosties
+++ b/service/ghosties
@@ -38,12 +38,24 @@ Public key (hex) for babe  : 0xe0f0a776ecc9fa5e1f22e2fa001fe3fba5aea52b9444bc894
 Public key (hex) for slow  : 0x0e6fa6934f9e99fa84874f2ed9318825a0d5443a0ced984acfbd24ece72ba55e
 Public key (hex) for gran  : 0xb63c5a0cf342b9b04931bc8ed74d7d0165ab99ab5f8a4514797d4b299a4501fe

-### Zoom ###
-Local identity             : 12D3KooWLxCLSGuDVHePoXEuyBVFfRPzYXiSVngpYSTVDEwxX49S
-Public key (hex) wallet    : 0xfc00ebab85e7271d8436b9258a4b80700f655810af632b3647109965f8b8e639
-==================================================================================================================
-Public key (hex) stash     : 0x1040c71fc62c08d520f04bff23814cf9a19673e385142f7ea910c7fbaa910e06
-Public key (hex) audi      : 0x60a07df1236d676011eb5a49c2e01a04f734a05599e0df51208899bfd746a23e
-Public key (hex) babe      : 0xf425e0965fc1b6593288a5d100396028217f5931f1bdebaf491358485dfa7f29
-Public key (hex) slow      : 0x10559a32c870d6087db5367f31c6828d5615effa8f0334362ec444666908ba59
-Public key (hex) gran      : 0x489b5c32c26dbb04ebaa41695d043934120cdb5794ecb9c51748a9e0edfb9286
+<<<<<<< HEAD
+### Neptune ###
+Local identity             : 12D3KooWJXBYA7cUQLLenEfT7hmCjBJ6fyikDy8YhNz4aLfwbBC8
+Public key (hex) wallet    : 0x6e4429a8fa85cfe2a60488af446d57e719207831b2579b937325645e110bb666
+===============================================================================================
+Public key (hex) for stash : 0x3a6626211a2dd35683fd7cb5f2f343d75f2b698d6c48c2d6eb1cdbe116e32315
+Public key (hex) for audi  : 0x86676ad3cd2d970b86dee2f25d4318f9bba40455111f16300e114e7f00c58706
+Public key (hex) for babe  : 0x6c0aec49974aaff08ff962a2d8d7857227d027ed27a272cbc4acaa1ee937db0f
+Public key (hex) for slow  : 0x009712519ba7dad1c682c871b94573ccaba8b7d530f7194fb16bf553fd7ae67d
+Public key (hex) for gran  : 0x935becdfb2e0d4fcd46ba82e680cfc447180de6b85ec42d17f1396a520b0c04f
+=======
+### Metanomad ###
+Local identity             : 12D3KooWJASrFcdtDNpWfaNLdbjHJVMz7FStySNvi2iDvjeqWRTJ
+Public key (hex) wallet    : 0x385dc4812133d58e558e5483401807dbdb040717d09dedd51839ef37628f0362
+===============================================================================================
+Public key (hex) for stash : 0x80e719e6eea7eef6f057b5b8d968817dc3e54f3251ea666b2748ee148b106c75
+Public key (hex) for audi  : 0x8618f3160621c67fcba8d147672998f7b8fea4f4cdf89bc4b08b06cee6ef0070
+Public key (hex) for babe  : 0x62e37d8b5990c7e45a1003e29898d2fc92d63616fbe24f7ba2fa8e862bf2e97a
+Public key (hex) for slow  : 0x1cada737675d125c16ab6180d3bede543de0519d6bb70e871cd55b197e31cf4d
+Public key (hex) for gran  : 0x492ae5b511805073e5adc66f51766b81c02450bcb5d3ef45e6b9cec7aa1b71c8
+>>>>>>> a33bbc7d976c806a0094a4212fd62292ba56d989
Author	SHA1	Message	Date
Metanomad	22aa1eeafd	Resolved conflict in service/ghosties Signed-off-by: Metanomad <root@vmi2223076.contaboserver.net>	2024-10-31 23:34:51 +01:00
Metanomad	02b591f852	metanomad Signed-off-by: Metanomad <root@vmi2223076.contaboserver.net>	2024-10-31 23:27:55 +01:00
Metanomad	a33bbc7d97	metanomad Signed-off-by: root <root@vmi2223076.contaboserver.net>	2024-10-31 21:58:16 +01:00
root	825e471edf	youconnect Signed-off-by: root <root@vmi2223076.contaboserver.net>	2024-10-28 19:45:54 +01:00