diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
| commit | e44f35c7b7fb49a55073c5b40257a4b8052cd5a0 (patch) | |
| tree | ad35f76e058386824229a64290a1ef15a9f120c2 /src/mauville_old_man.c | |
| parent | 0c1f85f2002e911f64a3b188fa30d8f465c0fc7e (diff) | |
| parent | db898d0e4854c70a356d037919ea48aed1f62816 (diff) | |
fix record mixing merge conflicts
Diffstat (limited to 'src/mauville_old_man.c')
| -rw-r--r-- | src/mauville_old_man.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index ea466b2ec..5c8be1581 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -387,7 +387,7 @@ static void ResetStorytellerFlag(void) Storyteller_ResetFlag(); } -void ResetMauvilleOldManFlag(void) // ResetMauvilleOldManFlag +void ResetMauvilleOldManFlag(void) { switch (GetCurrentMauvilleOldMan()) { |