Rename feedIcon asset to nnwFeedIcon.

Mac/AppAssets.swift

@@ -48,7 +48,7 @@ struct AppAssets {
 		return RSImage(named: "accountTheOldReader")
 	}()
 
-	static let nnwFeedIcon = RSImage(named: "feedIcon")!
+	static let nnwFeedIcon = RSImage(named: "nnwFeedIcon")!
 
 	@available(macOS 11.0, *)
 	static var addNewSidebarItemImage: RSImage = {

iOS/AppAssets.swift

@@ -51,6 +51,11 @@ struct AppAssets {
 		return UIImage(named: "accountTheOldReader")!
 	}()
 
+<<<<<<< HEAD
+=======
+	static let nnwFeedIcon = RSImage(named: "nnwFeedIcon")!
+
+>>>>>>> ecbc38963 (Rename feedIcon asset to nnwFeedIcon.)
 	static var articleExtractorError: UIImage = {
 		return UIImage(named: "articleExtractorError")!
 	}()

iOS/Resources/Assets.xcassets/nnwFeedIcon.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "feedIcon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "feedIcon 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "feedIcon 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}