fix
This commit is contained in:
parent
8f1aa3f4b1
commit
55a0bcfb82
|
@ -1,7 +1,3 @@
|
|||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> develop
|
||||
# == Schema Information
|
||||
#
|
||||
# Table name: projects
|
||||
|
@ -79,10 +75,6 @@
|
|||
# index_projects_on_updated_on (updated_on)
|
||||
#
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> develop
|
||||
|
||||
class Project < ApplicationRecord
|
||||
include Matchable
|
||||
|
|
Loading…
Reference in New Issue