Browse Source

fix

tags/v3.1.5
viletyy 5 years ago
parent
commit
55a0bcfb82
1 changed files with 0 additions and 8 deletions
  1. +0
    -8
      app/models/project.rb

+ 0
- 8
app/models/project.rb View File

@@ -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…
Cancel
Save