diff options
author | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
commit | fc11078cef11edc9deedd08c6175fb5e6628504c (patch) | |
tree | 62823b5dc1335a4d8659104dc4156713674ce757 /include/save.h | |
parent | ba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff) | |
parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) |
fix merge conflicts
Diffstat (limited to 'include/save.h')
-rw-r--r-- | include/save.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/save.h b/include/save.h index 6c47c6f60..c35ad547a 100644 --- a/include/save.h +++ b/include/save.h @@ -3,7 +3,7 @@ struct SaveSectionLocation { - void *data; + u8 *data; u16 size; }; |