8b6f6b88e0
# Conflicts: # .gitignore # etc/man.c # etc/your-reality.c # etc/your-reality.h # main.c # makefile
14 lines
No EOL
216 B
C
14 lines
No EOL
216 B
C
<<<<<<< HEAD
|
|
#ifndef _YOUR_REALITY_H
|
|
#define _YOUR_REALITY_H
|
|
|
|
void yourReality();
|
|
|
|
=======
|
|
#ifndef _YOUR_REALITY_H
|
|
#define _YOUR_REALITY_H
|
|
|
|
void yourReality();
|
|
|
|
>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
|
|
#endif |