Resolved conflict in service/ghosties

Signed-off-by: Metanomad <root@vmi2223076.contaboserver.net>
metanomad
2025-12-27 03:09:56 +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

-### Fujisan-1 ###
-Local identity             : 12D3KooWDWU21S6yxDapSnKAS3JnhaQBkT4iNTNQ8NpB4QgNUzxr
-Public key (hex) wallet    : 0xe0a13fb6efe591216ca3f2c5a495b9653a5255d0344b17cf02584c40b5b57043
-==================================================================================================================
-Public key (hex) stash     : 0xa00bd3284a6824ad7f757d98a2646c055126c5dd6450be383760b4f6c0193e40
-Public key (hex) audi      : 0x3680593818dfa5ed287de4320f730ae22f2a9c05ebebfad931322411ec508961
-Public key (hex) babe      : 0x3477d5cb7f3dffb8d76a33f32bcbcb5669f992d56ab222cfa0ab496b5b8bff12
-Public key (hex) slow      : 0x1cf9b6843abd08eee9f99c5db2c9546fa72ef603a5db0e3c9372e63ec6bb6a06
-Public key (hex) gran      : 0x3a539da581ced44fe567f9dee8a037fbd6cbe5027afe0c1099e3df0a621f030a
+<<<<<<< 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