ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-15 02:48:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict resolution

Browse Source
This commit is contained in:
Anton Dyudin 2016-06-24 16:50:57 -07:00
parent a6e1b087f0
commit 313de74ab3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ren/tree/head.hoon
View File

@ -50,14 +50,14 @@
:: "codemirror/4.3.0/mode/markdown/markdown.min.js");
;* ?. nopack.dbg
:_ ~
;script(type "text/javascript", src "{?.(aut "" "/~~")}".
"/~/at/===/web/pack/js/tree-urb.js");
:: "/~/at/===/web/pack/js/tree-hoon-urb.js");
;script(type "text/javascript", src "{?.(aut "" "/~~/~/at")}".
"/===/web/pack/js/tree-urb.js");
:: "/===/web/pack/js/tree-hoon-urb.js");
;=
:: ;script(type "text/javascript", src "/===/web/lib/js/hoon.js");
;script(type "text/javascript", src "/===/web/tree/main.js");
;script(type "text/javascript", src "{?.(aut "" "/~~")}".
"/~/at/===/web/lib/js/urb.js");
;script(type "text/javascript", src "{?.(aut "" "/~~/~/at")}".
"/===/web/lib/js/urb.js");
==
;link(type "application/rss+xml", rel "alternate", href "{(spud tub)}.rss-xml");
==