git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Aung Myo
2017-06-09 12:04:36 +06:30
parent ba9ebe12de e7a1687b85
commit 406172c6ff
82 changed files with 2071 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/api/origami/paypar_helper.rb Normal file
View File

@@ -0,0 +1,2 @@
module Api::Origami::PayparHelper
end

2
app/helpers/origami/paypar_helper.rb Normal file
View File

@@ -0,0 +1,2 @@
module Origami::PayparHelper
end

2
app/helpers/settings/membership_actions_helper.rb Normal file
View File

@@ -0,0 +1,2 @@
module Settings::MembershipActionsHelper
end