Update 0.2.6
This commit is contained in:
parent
58eec7ed22
commit
3a0cb7078c
11 changed files with 95 additions and 61 deletions
|
|
@ -1,14 +1,6 @@
|
|||
<<<<<<< HEAD
|
||||
#ifndef _YOUR_REALITY_H
|
||||
#define _YOUR_REALITY_H
|
||||
|
||||
void yourReality();
|
||||
|
||||
=======
|
||||
#ifndef _YOUR_REALITY_H
|
||||
#define _YOUR_REALITY_H
|
||||
|
||||
void yourReality();
|
||||
|
||||
>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
|
||||
#endif
|
||||
Reference in a new issue