On branch onesp
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   Stack/Makefile
	modified:   Stack/netudpv6.c
	modified:   Stack/stack
	modified:   Stack/stack.c
	modified:   Stack/stack.h
	new file:   ins.txt

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	.gitignore
 On branch onesp
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   netudpv6.c
	modified:   stack
	modified:   stack.c
	modified:   stack.h

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	../.Rhistory
	../.gitignore
Merge branch 'onesp'

Conflicts:
	Stack/netudpv6.c
	Stack/stack