# Conflicts: # .gitignore # etc/man.c # etc/your-reality.c # etc/your-reality.h # main.c # makefile |
||
|---|---|---|
| .. | ||
| logo.c | ||
| logo.h | ||
| man.c | ||
| man.h | ||
| math.c | ||
| math.h | ||
| your-reality.c | ||
| your-reality.h | ||
# Conflicts: # .gitignore # etc/man.c # etc/your-reality.c # etc/your-reality.h # main.c # makefile |
||
|---|---|---|
| .. | ||
| logo.c | ||
| logo.h | ||
| man.c | ||
| man.h | ||
| math.c | ||
| math.h | ||
| your-reality.c | ||
| your-reality.h | ||