index
:
ivy/ivy-c.git
master
C bindings for the Ivy library
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
src
/
ivy.c
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
space:
include
ignore
mode:
unified
ssdiff
stat only
Diffstat
(limited to 'src/ivy.c')
-rw-r--r--
src/ivy.c
4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/ivy.c b/src/ivy.c
index 28fb29f..1d750a7 100644
--- a/
src/ivy.c
+++ b/
src/ivy.c
@@ -1,10 +1,6 @@
/*
*
-<<<<<<< ivy.c
* $Id$
-=======
- * $Id$
->>>>>>> 1.2
*/
#include <stdlib.h>