ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-10 18:21:34 +03:00
Code Issues Packages Projects Releases Wiki Activity
An operating function
6,156 Commits 6 Branches 0 Tags 164 MiB
hoon 79.3%
TypeScript 16.7%
JavaScript 2.3%
CSS 0.4%
Python 0.4%
Other 0.8%
a895d470c2
Go to file
Anton Dyudin a895d470c2 fix bad conflict resolution in bab93e7 
fixes #357
going on the record as still baffled why there was even a conflict for the zuseflat merge to resolve
2017-03-14 11:34:23 -07:00
app Merge remote-tracking branch 'ohAitch/zuseflat-pretty' 2017-02-13 22:19:03 -05:00
gen Merge remote-tracking branch 'ohAitch/zuseflat-pretty' 2017-02-13 22:19:03 -05:00
lib Merge remote-tracking branch 'ohAitch/zuseflat-pretty' 2017-02-13 22:19:03 -05:00
mar Merge remote-tracking branch 'ohAitch/zuseflat-pretty' 2017-02-13 22:19:03 -05:00
ren Repository cleanup 2016-12-15 22:36:45 -08:00
sec/com Remove blank lines at EOF 2016-12-15 22:52:53 -08:00
sur Merge remote-tracking branch 'ohAitch/zuseflat-pretty' 2017-02-13 22:19:03 -05:00
sys fix bad conflict resolution in bab93e7 2017-03-14 11:34:23 -07:00
web Merge remote-tracking branch 'ohAitch/zuseflat-pretty' 2017-02-13 22:19:03 -05:00
.gitignore ignore sec client keys 2016-03-18 15:29:42 -07:00
LICENSE.txt Repository cleanup 2016-12-15 22:36:45 -08:00
web.md actually take out stream 2016-04-19 10:34:09 -07:00