diff options
| author | max-001 <maxsmits21@kpnmail.nl> | 2024-12-20 12:05:52 +0100 |
|---|---|---|
| committer | max-001 <maxsmits21@kpnmail.nl> | 2024-12-20 12:05:52 +0100 |
| commit | 74f70c61a37c94727e1411696f050cf588cf3446 (patch) | |
| tree | 389c1e1a9b4b3a94dc9c10a94f00b28fe1e007ff /game | |
| parent | 79d3a9f4311e6684b6df83a15ca7844f58c1959c (diff) | |
Fix merge issues
Diffstat (limited to 'game')
| -rw-r--r-- | game/main.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/game/main.cpp b/game/main.cpp index af14ed5..237c8ce 100644 --- a/game/main.cpp +++ b/game/main.cpp @@ -1,3 +1 @@ -int main() { - -} +int main() {} |