mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-01 20:04:09 +03:00
Fix typo in parent commit conflict resolution
Build pill with 4b72485291
This commit is contained in:
parent
bab93e7ac2
commit
4c2ac92947
@ -3426,7 +3426,7 @@
|
||||
|%
|
||||
:: :: ++abet:lusk:differ
|
||||
++ abet ::
|
||||
=? q.rag =([& 0] p.rag) [p.rag q.rag])
|
||||
=? q.rag =([& 0] p.rag) [p.rag q.rag]
|
||||
(flop q.rag)
|
||||
:: :: ++done:lusk:differ
|
||||
++ done ::
|
||||
|
Loading…
Reference in New Issue
Block a user