diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-11-28 13:53:03 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-11-28 13:53:03 +0100 |
commit | 298f0f43357c5fd12c4498d74a35d71a0501ae1a (patch) | |
tree | bdc0d80d48c215d395a7ee69bdd80c66cc8e2159 /src/components/settings | |
parent | d5e8e3ca44e998511907d1ec74c98c06c2e542b8 (diff) | |
parent | 3a41bff9eaf9cbae6d3864664ad08859ec2d2c44 (diff) |
Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes
# Conflicts:
# doc/contribute.md
# src/displayapp/screens/BatteryInfo.h
Diffstat (limited to 'src/components/settings')
-rw-r--r-- | src/components/settings/Settings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/settings/Settings.cpp b/src/components/settings/Settings.cpp index 37c09f91..ef73ad1c 100644 --- a/src/components/settings/Settings.cpp +++ b/src/components/settings/Settings.cpp @@ -1,4 +1,4 @@ -#include "Settings.h" +#include "components/settings/Settings.h" #include <cstdlib> #include <cstring> |