From 43d6bcf02105f9b46e2ba5f7fcae2bdc8f495692 Mon Sep 17 00:00:00 2001
From: CoolStar <coolstarorganization@gmail.com>
Date: Thu, 10 May 2018 15:02:12 -0700
Subject: Fix merge issue

---
 apt-pkg/tagfile.cc | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 427e459bd..1e7f2867c 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -625,14 +625,6 @@ void pkgTagSection::Trim()
    for (; Stop > Section + 2 && (Stop[-2] == '\n' || Stop[-2] == '\r'); Stop--);
 }
 									/*}}}*/
-// TagSection::Trim - Trim off any trailing garbage			/*{{{*/
-// ---------------------------------------------------------------------
-/* There should be exactly 1 newline at the end of the buffer, no more. */
-void pkgTagSection::Trim()
-{
-   for (; Stop > Section + 2 && (Stop[-2] == '\n' || Stop[-2] == '\r'); Stop--);
-}
-
 // TagSection::Exists - return True if a tag exists			/*{{{*/
 bool pkgTagSection::Exists(StringView Tag) const
 {
-- 
cgit v1.2.3