fix merge conflict · 543cf723ef - jellyfin-ha-src - Gitea

unkin/jellyfin-ha-src

fix merge conflict

This commit is contained in:

Luke Pulverenti

2015-09-20 13:24:58 -04:00

parent 7c7f05e6e2

commit 543cf723ef

1 changed files with 1 additions and 1 deletions

									
										MediaBrowser.Api/Devices/DeviceService.cs
									
		+1
		-1
	
												View File
												
				@@ -158,4 +158,4 @@ namespace MediaBrowser.Api.Devices

				            }

				        }

				    }

				}

				}