From 55a0bcfb82a49fd8351f9379e8d587ec4c7ab5b8 Mon Sep 17 00:00:00 2001
From: viletyy <yystopf@163.com>
Date: Mon, 12 Jul 2021 17:33:10 +0800
Subject: [PATCH] fix

---
 app/models/project.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index fc78de658..a47ee4239 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -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