Merge pull request #34 from bmoliveira/kajensen-default-color

Kajensen default color - Merging conflicts
bmoliveira · Jan 15, 2019 · 84821f7 · 84821f7
2 parents 560a337 + a79a687
commit 84821f7
Show file tree

Hide file tree

Showing 5 changed files with 470 additions and 84 deletions.
diff --git a/.../Pods/Target Support Files/Pods-MarkdownKit_Example/Pods-MarkdownKit_Example-resources.sh b/.../Pods/Target Support Files/Pods-MarkdownKit_Example/Pods-MarkdownKit_Example-resources.sh
diff --git a/...ple/Pods/Target Support Files/Pods-MarkdownKit_Tests/Pods-MarkdownKit_Tests-frameworks.sh b/...ple/Pods/Target Support Files/Pods-MarkdownKit_Tests/Pods-MarkdownKit_Tests-frameworks.sh
diff --git a/Example/Pods/Target Support Files/Pods-MarkdownKit_Tests/Pods-MarkdownKit_Tests-resources.sh b/Example/Pods/Target Support Files/Pods-MarkdownKit_Tests/Pods-MarkdownKit_Tests-resources.sh
diff --git a/MarkdownKit/Classes/Elements/MarkdownLink.swift b/MarkdownKit/Classes/Elements/MarkdownLink.swift
@@ -68,4 +68,3 @@ open class MarkdownLink: MarkdownLinkElement {
     attributedString.addAttributes(attributes, range: range)
   }
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -68,4 +68,3 @@ open class MarkdownLink: MarkdownLinkElement {
		attributedString.addAttributes(attributes, range: range)
		}
		}