Changed EOL into readme.md

readme.md

@@ -1,6 +1,9 @@
 <!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-refresh-toc -->
 **Table of Contents**
+<<<<<<< HEAD
 
+=======
+>>>>>>> Changed EOL into readme.md
 - [MovieNight stream server](#movienight-stream-server)
     - [Build requirements](#build-requirements)
         - [Older Go Versions](#older-go-versions)
@@ -16,7 +19,10 @@
 
 <!-- markdown-toc end -->
 # MovieNight stream server
+<<<<<<< HEAD
 
+=======
+>>>>>>> Changed EOL into readme.md
 [![Build status](https://api.travis-ci.org/zorchenhimer/MovieNight.svg?branch=master)](https://travis-ci.org/zorchenhimer/MovieNight)
 
 This is a single-instance streaming server with chat.  Originally written to
@@ -24,12 +30,18 @@ replace Rabbit as the platform for watching movies with a group of people
 online.
 
 ## Build requirements
+<<<<<<< HEAD
 
+=======
+>>>>>>> Changed EOL into readme.md
 - Go 1.13 or newer
 - GNU Make
 
 ### Older Go Versions
+<<<<<<< HEAD
 
+=======
+>>>>>>> Changed EOL into readme.md
 You can install a newer version of Go alongside your OS's distribution by
 following the guide here: [https://golang.org/doc/install#extra_versions](https://golang.org/doc/install#extra_versions)
 
@@ -45,7 +57,11 @@ You have to :
 - build **make TARGET=windows ARCH=386**;
 - and run **./MovieNight**;
 
+<<<<<<< HEAD
 Example :
+=======
+Example : 
+>>>>>>> Changed EOL into readme.md
 ```bash
 $ git clone https://github.com/zorchenhimer/MovieNight
 $ cd MovieNight
@@ -94,7 +110,10 @@ The container needs to be restarted to apply any changes you make to *settings.j
 An script wich setup an Jail and build and run MovieNight into that Jail as been writen, you'll find it here [freenas-iocage-movienight] (https://github.com/zorglube/freenas-iocage-movienight)
 
 ## Usage
+<<<<<<< HEAD
 
+=======
+>>>>>>> Changed EOL into readme.md
 Now you can use OBS to push a stream to the server.  Set the stream URL to
 
 ```text
@@ -139,7 +158,10 @@ Usage of .\MovieNight.exe:
 ```
 
 ## Configuration
+<<<<<<< HEAD
 
+=======
+>>>>>>> Changed EOL into readme.md
 MovieNight’s configuration is controlled by `settings.json`:
 
 - `AdminPassword`: users can enter `/auth <value>` into chat to grant themselves
@@ -179,5 +201,8 @@ MovieNight’s configuration is controlled by `settings.json`:
   header, to prevent caching responses.
 
 ## License
+<<<<<<< HEAD
 
+=======
+>>>>>>> Changed EOL into readme.md
 `flv.js` is Licensed under the Apache 2.0 license.  This project is licened under the MIT license.