Discource-C
/
discourse-subscriptions
mirror of https://github.com/discourse/discourse-subscriptions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix broken merge. Doh!

This commit is contained in:
Rimian Perkins 2019-11-08 08:55:23 +11:00
parent bf47fbec86
commit 7c350b7881
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin.rb
View File

@ -2,11 +2,7 @@
# name: discourse-patrons # name: discourse-patrons
# about: Integrates Stripe into Discourse to allow visitors to make payments and Subscribe # about: Integrates Stripe into Discourse to allow visitors to make payments and Subscribe
<<<<<<< HEAD
# version: 2.0.0 # version: 2.0.0
=======
# version: 1.3.1
>>>>>>> 0b90caac2d8bd82beb147226c00417883391edcb
# url: https://github.com/rimian/discourse-patrons # url: https://github.com/rimian/discourse-patrons
# authors: Rimian Perkins # authors: Rimian Perkins
@ -45,11 +41,7 @@ end
after_initialize do after_initialize do
::Stripe.api_version = "2019-11-05" ::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: '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", "../lib/discourse_patrons/engine",