From f30bf3ae82db05680a9cda2c388d099c5b74b244 Mon Sep 17 00:00:00 2001
From: Anupriya Tripathi <anupriya.tripathi92@gmail.com>
Date: Thu, 18 Feb 2016 10:29:33 -0800
Subject: [PATCH] testing merge conflict by changing comment

---
 weeks/week04/2_compare_alignment_vs_quasialignment.ipynb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weeks/week04/2_compare_alignment_vs_quasialignment.ipynb b/weeks/week04/2_compare_alignment_vs_quasialignment.ipynb
index 6c9fe1a..1106bd2 100644
--- a/weeks/week04/2_compare_alignment_vs_quasialignment.ipynb
+++ b/weeks/week04/2_compare_alignment_vs_quasialignment.ipynb
@@ -215,7 +215,7 @@
    },
    "outputs": [],
    "source": [
-    "# YOUR CODE HERE"
+    "# YOUR CODE HERE mclkmdlknvlklndlknlk"
    ]
   },
   {
@@ -2619,4 +2619,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 0
-}
\ No newline at end of file
+}