update to current master to resolve merge conflict

1 files changed, 17 insertions, 0 deletions

diff --git a/MediaBrowser.Model/System/CastReceiverApplication.cs b/MediaBrowser.Model/System/CastReceiverApplication.cs
new file mode 100644
index 0000000000..6a49a5cac4
--- /dev/null
+++ b/MediaBrowser.Model/System/CastReceiverApplication.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.System;
+
+/// <summary>
+/// The cast receiver application model.
+/// </summary>
+public class CastReceiverApplication
+{
+    /// <summary>
+    /// Gets or sets the cast receiver application id.
+    /// </summary>
+    public required string Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the cast receiver application name.
+    /// </summary>
+    public required string Name { get; set; }
+}