mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-11-28 19:55:53 +03:00
d94aa5704b
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. |
||
|---|---|---|
| .. | ||
| arvo | ||
| base-dev | ||
| bitcoin | ||
| btc-wallet | ||
| docker-image | ||
| ent | ||
| garden | ||
| garden-dev | ||
| grid | ||
| herb | ||
| hs | ||
| interface | ||
| landscape | ||
| npm | ||
| urbit | ||
| urcrypt | ||
| webterm | ||
| symbolic-merge.sh | ||