Resolved merge conflicts

This commit is contained in:
2017-09-02 10:08:52 -04:00
2 changed files with 11 additions and 6 deletions

View File

@@ -25,5 +25,5 @@ Special thanks go to these people who, while not directly contributing, helped i
* the maintainers for all used libraries, including ctrulib, zlib, citro3d, pp2d and minizip.
* all the people who helped keep me going and motivated me to work. This includes, but is definitely not limited to:
* The members of the [Nintendo Homebrew Discord](https://discord.gg/C29hYvh)
* The members of the Secret Shack Service Discord
* The members of the ThemePlaza Discord
  * The members of the Secret Shack Service Discord
  * The members of the [ThemePlaza Discord](https://discord.gg/2hUQwXz)

View File

@@ -93,9 +93,14 @@ int main(void)
if (kDown & KEY_START)
{
exit_screens();
exit_services();
APT_HardwareResetAsync();
if(!envIsHomebrew())
{
srvPublishToSubscriber(0x202, 0);
}
else
{
break;
}
}
else if (kDown & KEY_L)
{
@@ -240,6 +245,6 @@ int main(void)
}
free(themes_list);
exit_services();
return 0;
}