iosutils.mm fix

MerginMaps · May 15, 2024 · ca51d52 · ca51d52
1 parent cc302b8
commit ca51d52
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/app/ios/iosutils.mm b/app/ios/iosutils.mm
@@ -14,16 +14,13 @@
  ***************************************************************************/
 
 #include <UIKit/UIKit.h>
-<<< <<< < HEAD
 #include <sys/utsname.h>
-== == == =
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #include <QString>
-  >>> >>> > 05801f46( ios pdf viewing )
 #include "iosutils.h"
 
-  void IosUtils::setIdleTimerDisabled()
+void IosUtils::setIdleTimerDisabled()
 {
   [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
 }