git.iko.soy/urbit.org
on master help sign in
remove merge conflict remnant in project-history.md
84dc57cMatilde Park
content/understanding-urbit/project-history.md−4
compare with master
unifiedsplit
@@ -24,9 +24,6 @@ Urbit OS isn’t just an interface — it’s a complete system. You should also
24
24
25At the beginning, Urbit was just a few people with the right combination of imagination and discipline to try to rebuild computing. Now it's a community of thousands of address space holders, dozens of open source developers, at least two independent companies ([Tlon](https://tlon.io) — which works mostly on kernel development and interface design, and [urbit.live](https://urbit.live) — which is building services on the platform), and who knows how many fans.
25At the beginning, Urbit was just a few people with the right combination of imagination and discipline to try to rebuild computing. Now it's a community of thousands of address space holders, dozens of open source developers, at least two independent companies ([Tlon](https://tlon.io) — which works mostly on kernel development and interface design, and [urbit.live](https://urbit.live) — which is building services on the platform), and who knows how many fans.
26
26
27−<<<<<<< HEAD
28−![](https://media.urbit.org/site/understanding-urbit/project-history/project-history-05.svg)
29−=======
30**History**
27**History**
31
28
32![](https://media.urbit.org/site/understanding-urbit/project-history/project-history-05.svg)
29![](https://media.urbit.org/site/understanding-urbit/project-history/project-history-05.svg)
@@ -34,4 +31,3 @@ At the beginning, Urbit was just a few people with the right combination of imag
34**Roadmap**
31**Roadmap**
35
32
36![](https://media.urbit.org/site/understanding-urbit/project-history/project-history-06.svg)
33![](https://media.urbit.org/site/understanding-urbit/project-history/project-history-06.svg)
37−>>>>>>> 161f70a0fed1632f1bedae9c397d35a409f6255e