Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Missed conflict... ugh

  • Loading branch information...
commit a966dd730a5a6f05ae1f51cb77f1005d168a3cff 1 parent b1c862f
@skalnik skalnik authored
Showing with 0 additions and 3 deletions.
  1. +0 −3  app/models/status.rb
View
3  app/models/status.rb
@@ -2,11 +2,8 @@
class Status < ActiveRecord::Base
include Twitter::Autolink
-<<<<<<< HEAD
-=======
include Twitter::Extractor
->>>>>>> 9f918e3523302520a67df12f8597d0c6e25617d6
validate :set_project_from_code
validates_presence_of :user_id, :message
validate :times_are_sane
Please sign in to comment.
Something went wrong with that request. Please try again.