Resolving conflict from 76094595
commit19077f713108ebdfc31a6adc59538a017e6f3027
authorMatilde Park <matilde@tlon.io>
dateThu 3 Oct 2019, 17:58 (7 years ago)
parent13736bd
.gitmodules−3
@@ -1,3 +0,0 @@
1−[submodule "content/docs"]
2− path = content/docs
3− url = git@github.com:urbit/docs.git
content/docsdeleted−1
Submodule changed.