resolved the conflict

2013-09-03 23:46:41 +02:00 · 2013-09-03 23:46:41 +02:00 · 40b379859c
commit 40b379859c
parent 891f871ba7 6fa72c5d9d
29 changed files with 600 additions and 249 deletions
--- a/lib/pure/typetraits.nim
+++ b/lib/pure/typetraits.nim
@ -13,3 +13,5 @@
 proc name*(t: typedesc): string {.magic: "TypeTrait".}
  ## Returns the name of the given type

+proc arity*(t: typedesc): int {.magic: "TypeTrait".}
+  ## Returns the arity of the given type