fixed conflict

2017-06-07 22:29:43 +06:30
parent fd1c53432c f9c8dbc03e
commit 44382d284f
52 changed files with 746 additions and 249 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -4,6 +4,6 @@ class Account < ApplicationRecord
 	has_many :menu_items
 	
    def self.collection
-	    Account.select("id, title").map { |e| [e.title, e.id] }
-	  end
+    Account.select("id, title").map { |e| [e.title, e.id] }
+  end
 end