From cf9298b76223965158bab2cafedc8fd9b4248df0 Mon Sep 17 00:00:00 2001
From: Alexander OSTROVSKY <alexanderostrovsky@Caroline.local>
Date: Tue, 14 May 2019 14:02:03 -0400
Subject: [PATCH] linted

---
 lib/galaxy/datatypes/text.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/galaxy/datatypes/text.py b/lib/galaxy/datatypes/text.py
index f05401c6fb7..b4424f09207 100644
--- a/lib/galaxy/datatypes/text.py
+++ b/lib/galaxy/datatypes/text.py
@@ -730,6 +730,7 @@ class IQTree(Text):
         return file_prefix.startswith("IQ-TREE")
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 @build_sniff_from_prefix
 class Paf(Text):
@@ -858,6 +859,9 @@ class Gfa2(Text):
             found_valid_lines = True
         return found_valid_lines
 =======
+=======
+
+>>>>>>> 8cffc5cc03... linted
 @build_sniff_from_prefix
 class Yaml(Text):
     """Yaml files"""