From 7c350b78810459f80984847de69ed7dc15cedc7a Mon Sep 17 00:00:00 2001
From: Rimian Perkins <hello@rimian.com.au>
Date: Fri, 8 Nov 2019 08:55:23 +1100
Subject: [PATCH] fix broken merge. Doh!

---
 plugin.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/plugin.rb b/plugin.rb
index 8335365..2e878f3 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -2,11 +2,7 @@
 
 # name: discourse-patrons
 # about: Integrates Stripe into Discourse to allow visitors to make payments and Subscribe
-<<<<<<< HEAD
 # version: 2.0.0
-=======
-# version: 1.3.1
->>>>>>> 0b90caac2d8bd82beb147226c00417883391edcb
 # url: https://github.com/rimian/discourse-patrons
 # authors: Rimian Perkins
 
@@ -45,11 +41,7 @@ end
 
 after_initialize do
   ::Stripe.api_version = "2019-11-05"
-<<<<<<< HEAD
   ::Stripe.set_app_info('Discourse Patrons', version: '2.0.0', url: 'https://github.com/rimian/discourse-patrons')
-=======
-  ::Stripe.set_app_info('Discourse Patrons', version: '1.3.1', url: 'https://github.com/rimian/discourse-patrons')
->>>>>>> 0b90caac2d8bd82beb147226c00417883391edcb
 
   [
     "../lib/discourse_patrons/engine",