Fix merge conflicts

[bsdgames-darwin.git] / sail / array.h

diff --git a/sail/array.h b/sail/array.h
index 2a5642447f582cbac8f061fa33deffc2d9021604..11854ec2882edabc851538e178df5a1d0af59ab9 100644 (file)
--- a/sail/array.h
+++ b/sail/array.h
@@ -126,7 +126,7 @@ array_add(struct array *a, void *val, unsigned *index_ret)
  * in array.c.
  *
  * Example usage in e.g. item.h of some game:
- * 
+ *
  * DECLARRAY_BYTYPE(stringarray, char);
  * DECLARRAY(potion);
  * DECLARRAY(sword);