From 26cecc863fd7d1d4b0131873895f3e004c24f4f2 Mon Sep 17 00:00:00 2001
From: Jim Lyke <jlyke@JLyke-MacBook.local>
Date: Wed, 7 Sep 2016 08:57:12 -1000
Subject: [PATCH 1/2] How I installed the DRP

---
 EXAMPLE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/EXAMPLE.md b/EXAMPLE.md
index 10bc92f..bdfb873 100644
--- a/EXAMPLE.md
+++ b/EXAMPLE.md
@@ -284,3 +284,4 @@ tests/test_emission_line/test_emission_line.py .
 ```
 ## Test Successful
 
+

From 0cbda916c666921a954f4bb50b4cbc412010c112 Mon Sep 17 00:00:00 2001
From: Jim Lyke <jlyke@JLyke-MacBook.local>
Date: Thu, 8 Sep 2016 11:30:06 -1000
Subject: [PATCH 2/2] How to install the DRP

---
 EXAMPLE.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/EXAMPLE.md b/EXAMPLE.md
index bdfb873..38fa82e 100644
--- a/EXAMPLE.md
+++ b/EXAMPLE.md
@@ -283,5 +283,8 @@ tests/test_emission_line/test_emission_line.py .
 ========================== 1 passed in 93.84 seconds ===========================
 ```
 ## Test Successful
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> e7e9ac5fcd93f8c47d191a24cb0360fc67d90e32