解决冲突

app/models/project.rb

@@ -61,6 +61,7 @@ class Project < ActiveRecord::Base
                           
 
 
+  
   has_many :tags, :through => :project_tags, :class_name => 'Tag'
   has_many :project_tags, :class_name => 'ProjectTags'         
 

app/models/user.rb

@@ -76,6 +76,7 @@ class User < Principal
   has_one :api_token, :class_name => 'Token', :conditions => "action='api'"
   belongs_to :auth_source
 
+  
 #####fq
   has_many :jours, :class_name => 'JournalsForMessage', :dependent => :destroy
   has_many :bids, :foreign_key => 'author_id', :dependent => :destroy