hey look I did a git merge without breaking anything

Samgisaninja · May 9, 2020 · 6829c31 · 6829c31
1 parent b29c4a2
commit 6829c31
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/...deproj/project.xcworkspace/xcuserdata/samgardner.xcuserdatad/IDEFindNavigatorScopes.plist b/...deproj/project.xcworkspace/xcuserdata/samgardner.xcuserdatad/IDEFindNavigatorScopes.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array/>
+</plist>
diff --git a/...proj/project.xcworkspace/xcuserdata/samgardner.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/samgardner.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Template/DEBIAN/control b/Template/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: com.samgisaninja.successionrestore
 Name: Succession
-Version: 1.4.13-b4
+Version: 1.4.13
 Architecture: iphoneos-arm
 Description: Restore without updating via rootfilesystem DMG
 Maintainer: Samg_is_a_Ninja