Commit Graph

4 Commits

Author SHA1 Message Date
fang
e6db12cd82
testnet: tweaks for ropsten 2022-05-23 23:25:33 +02:00
Jōshin
d94aa5704b
Merge branch 'master' into next/arvo
Conflicts:
	pkg/arvo/lib/azimuth.hoon

This file was turned into a symlink to pkg/base-dev/lib/azimuth.hoon on
one side of the fork, and meanwhile edited on the other side of the fork
(to update ecliptic to the new address for the WSTR fix.)

The two sides of the fork both had different outdated addresses in
base-dev's azimuth.hoon file, and Git's UI helpfully refilled the
contents of arvo's azimuth.hoon so that it showed a merge conflict with
an empty diff.

Resolved by reading out HEAD:pkg/arvo/lib/azimuth.hoon into
pkg/base-dev/lib/azimuth.hoon and manually recreating the symlink.
2021-12-10 08:24:32 +00:00
Yaseen
8819d61ff6 symlink arvo/lib/azimuth.hoon to base-dev/lib/azimuth.hoon 2021-11-19 12:33:12 -05:00
Ted Blackman
f958b7874f various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00