fix assets

FreeAPS/Resources/Assets.xcassets/oiAPSWhiteShadow.appiconset/Contents.json

@@ -1,20 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "D.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-      "filename" : "D 1.png",
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

FreeAPS/Resources/Assets.xcassets/oiaps3D.appiconset/Contents.json

@@ -1,20 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "OiAPS  3d.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-      "filename" : "3D Watch.png",
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

FreeAPS/Resources/Assets.xcassets/oiapsBlack.appiconset/Contents.json

@@ -1,28 +0,0 @@
-{
-  "images" : [
-    {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsBlack.appiconset/Contents.json
-      "filename" : "A.png",
-========
-      "filename" : "C 1.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioColorBG.appiconset/Contents.json
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsBlack.appiconset/Contents.json
-      "filename" : "A 1.png",
-========
-      "filename" : "C.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioColorBG.appiconset/Contents.json
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

FreeAPS/Resources/Assets.xcassets/oiapsColorBG.appiconset/Contents.json

@@ -1,28 +0,0 @@
-{
-  "images" : [
-    {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsColorBG.appiconset/Contents.json
-      "filename" : "C 1.png",
-========
-      "filename" : "9.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioWhite.appiconset/Contents.json
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsColorBG.appiconset/Contents.json
-      "filename" : "C.png",
-========
-      "filename" : "8.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioWhite.appiconset/Contents.json
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

FreeAPS/Resources/Assets.xcassets/oiapsWhite.appiconset/Contents.json

@@ -1,28 +0,0 @@
-{
-  "images" : [
-    {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsWhite.appiconset/Contents.json
-      "filename" : "9.png",
-========
-      "filename" : "A.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioBlack.appiconset/Contents.json
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsWhite.appiconset/Contents.json
-      "filename" : "8.png",
-========
-      "filename" : "A 1.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioBlack.appiconset/Contents.json
-      "idiom" : "universal",
-      "platform" : "watchos",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

FreeAPS/Resources/Assets.xcassets/trioBlack.appiconset/Contents.json

@@ -1,21 +1,13 @@
 {
   "images" : [
     {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsWhite.appiconset/Contents.json
-      "filename" : "9.png",
-========
       "filename" : "A.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioBlack.appiconset/Contents.json
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
     },
     {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsWhite.appiconset/Contents.json
-      "filename" : "8.png",
-========
       "filename" : "A 1.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioBlack.appiconset/Contents.json
       "idiom" : "universal",
       "platform" : "watchos",
       "size" : "1024x1024"

FreeAPS/Resources/Assets.xcassets/trioColorBG.appiconset/Contents.json

@@ -1,21 +1,13 @@
 {
   "images" : [
     {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsBlack.appiconset/Contents.json
-      "filename" : "A.png",
-========
       "filename" : "C 1.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioColorBG.appiconset/Contents.json
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
     },
     {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsBlack.appiconset/Contents.json
-      "filename" : "A 1.png",
-========
       "filename" : "C.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioColorBG.appiconset/Contents.json
       "idiom" : "universal",
       "platform" : "watchos",
       "size" : "1024x1024"

FreeAPS/Resources/Assets.xcassets/trioWhite.appiconset/Contents.json

@@ -1,21 +1,13 @@
 {
   "images" : [
     {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsColorBG.appiconset/Contents.json
-      "filename" : "C 1.png",
-========
       "filename" : "9.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioWhite.appiconset/Contents.json
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
     },
     {
-<<<<<<<< HEAD:FreeAPS/Resources/Assets.xcassets/oiapsColorBG.appiconset/Contents.json
-      "filename" : "C.png",
-========
       "filename" : "8.png",
->>>>>>>> 9672da256c317a314acc76d6e4f6e82cc174d133:FreeAPS/Resources/Assets.xcassets/trioWhite.appiconset/Contents.json
       "idiom" : "universal",
       "platform" : "watchos",
       "size" : "1024x1024"

Trio.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,13 +1,12 @@
 {
-  "originHash" : "59ac7eba66375d6eb406e758cb0b9964f4b3b0ae45c5665596f00384c32262b9",
   "pins" : [
     {
       "identity" : "cryptoswift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/krzyzanowskim/CryptoSwift",
       "state" : {
-        "revision" : "19b3c3ceed117c5cc883517c4e658548315ba70b",
-        "version" : "1.6.0"
+        "revision" : "c9c3df6ab812de32bae61fc0cd1bf6d45170ebf0",
+        "version" : "1.8.2"
       }
     },
     {
@@ -49,7 +48,7 @@
     {
       "identity" : "swiftcharts",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/ivanschuetz/SwiftCharts",
+      "location" : "https://github.com/ivanschuetz/SwiftCharts.git",
       "state" : {
         "branch" : "master",
         "revision" : "c354c1945bb35a1f01b665b22474f6db28cba4a2"
@@ -88,9 +87,9 @@
       "location" : "https://github.com/tidepool-org/TidepoolKit",
       "state" : {
         "branch" : "dev",
-        "revision" : "b8185353c0f46a055f6d5681bb3f18ec86a5b974"
+        "revision" : "5c92b4ffc29cabf07609b367e3f82d0f733a6bc1"
       }
     }
   ],
-  "version" : 3
+  "version" : 2
 }