Resolving conflict from 1b2342bf
commit871cbfb8584cf07fffd28218f56e652faf8b8f2a
authorMatilde Park <matilde@tlon.io>
dateWed 2 Oct 2019, 22:07 (7 years ago)
parent216b5ae
.gitmodules+1−1
@@ -1,3 +1,3 @@
11[submodule "content/docs"]
22 path = content/docs
3− url = git@github.com:urbit/docs.git
3+ url = git@github.com:urbit/docs.git