From a3fb7347b9cfe094e8aa6c8d688d1926b0933566 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 19 Jan 2016 14:44:31 -0500 Subject: [PATCH] fix merge conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ee0855b74..ead2a2da3f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Emby Server Emby Server is a home media server built on top of other popular open source technologies such as **Service Stack**, **jQuery**, **jQuery mobile**, and **Mono**. -It features a REST-based api with built-in documention to facilitate client development. We also have client libraries for our api to enable rapid development. +It features a REST-based API with built-in documention to facilitate client development. We also have client libraries for our API to enable rapid development. ## Emby Apps