resolve rebase and merge

textile · Aug 9, 2024 · 8a83b7d · 8a83b7d
2 parents 4c620d9 + 3478434
commit 8a83b7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tests/test_lists.py b/tests/test_lists.py
@@ -1,7 +1,6 @@
 from textile import Textile
 from textile.objects.list import List
 
-
 def test_lists():
     t = Textile()
     result = t.textileLists("* one\n* two\n* three")

diff --git a/textile/core.py b/textile/core.py
@@ -360,8 +360,10 @@ def fTextileList(self, match):
             if ';' in pt and ':' in tl:
                 ls[tl] = 2
 
-            # atts = pba(atts) tabs = '\t' * len(tl) If start is still None,
-            # set it to '', else leave the value that we've already formatted.
+            # atts = pba(atts)
+            # tabs = '\t' * len(tl)
+            # If start is still None, set it to '', else leave the value
+            # that we've already formatted.
             start = start or ''
             # if this item tag isn't in the list, create a new list and
             # item, else just create the item