urbit/web.md

---
container: false
layout: plan
anchor: none
---

<div class="above">
  <div class="container panel stack">
    <panel></panel>
  </div>
  <div class="container plan stack">
    <div class="col-md-10">
      <plan></plan>
    </div>
  </div>
</div>
Merge branch 'factor' of github.com:ohAitch/urbit into factor Conflicts: urb/zod/web/tree/main.js (had a newer main.js) talk@https://github.com/urbit/talk/commit/26b0befe86242691fe4fc64d7f07e977cbfd9dc1 tree@https://github.com/urbit/tree/commit/621235bf526ed84e7921efed778d596e38d4604a 2016-02-05 03:16:18 +03:00			`---`
home head 2016-04-04 08:14:47 +03:00			`container: false`
			`layout: plan`
panel bar 2016-04-05 00:38:54 +03:00			`anchor: none`
Merge branch 'factor' of github.com:ohAitch/urbit into factor Conflicts: urb/zod/web/tree/main.js (had a newer main.js) talk@https://github.com/urbit/talk/commit/26b0befe86242691fe4fc64d7f07e977cbfd9dc1 tree@https://github.com/urbit/tree/commit/621235bf526ed84e7921efed778d596e38d4604a 2016-02-05 03:16:18 +03:00			`---`

home head 2016-04-04 08:14:47 +03:00			`<div class="above">`
panel bar 2016-04-05 00:38:54 +03:00			`<div class="container panel stack">`
			`<panel></panel>`
			`</div>`
			`<div class="container plan stack">`
home head 2016-04-04 08:14:47 +03:00			`<div class="col-md-10">`
			`<plan></plan>`
			`</div>`
			`</div>`
remove stream, update tree 2016-04-07 01:06:06 +03:00			`</div>`