floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix

This commit is contained in:
viletyy 2021-07-12 17:33:10 +08:00
parent 8f1aa3f4b1
commit 55a0bcfb82
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/project.rb
View File

@ -1,7 +1,3 @@
<<<<<<< HEAD
=======
>>>>>>> develop
# == Schema Information # == Schema Information
# #
# Table name: projects # Table name: projects
@ -79,10 +75,6 @@
# index_projects_on_updated_on (updated_on) # index_projects_on_updated_on (updated_on)
# #
<<<<<<< HEAD
=======
>>>>>>> develop
class Project < ApplicationRecord class Project < ApplicationRecord
include Matchable include Matchable