refresh transcript

This commit is contained in:
Paul Chiusano 2021-08-04 12:10:48 -04:00
parent 2d1b85e89f
commit 93dc3fa35c

View File

@ -101,7 +101,7 @@ d = c + 10
merge.
```
At this point, `a3` is conflicted for symbols `c` and `d`, but the original `a2` namespace has an unconflicted definition for `c` and `d`.
At this point, `a3` is conflicted for symbols `c` and `d`, but the original `a2` namespace has an unconflicted definition for `c` and `d`, so those are preferred.
```ucm
.> view a b c d