fixed conflict

2017-06-09 12:04:36 +06:30
parent ba9ebe12de e7a1687b85
commit 406172c6ff
82 changed files with 2071 additions and 337 deletions
--- a/app/controllers/api/memberships_controller.rb
+++ b/app/controllers/api/memberships_controller.rb
@@ -1,7 +1,7 @@
 class Api::MembershipsController < ActionController::API
  before :authenticate_token

-
+  
  #Add Membership to invoice
  def create