[roundcubemail: 21/22] merge clean-up

[Adam Williamson]

commit f39f6277e056e9f8b995b7fa679e6f0d4a8910aa
Author: Adam Williamson <awilliam at redhat.com>
Date:   Sat Dec 20 09:56:34 2014 -0800

    merge clean-up

 roundcubemail.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/roundcubemail.spec b/roundcubemail.spec
index 51a23f8..1095592 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -256,7 +256,6 @@ rm -rf %{buildroot}
 - Latest upstream.
 - Updated strict patch.
 - XSS patch upstreamed.
->>>>>>> f18
 
 * Mon Aug 20 2012 Jon Ciesla <limburgher at gmail.com> - 0.7.3-1
 - 0.7.3, patch for XSS in signature issue, BZ 849616, 849617.