From: Rin Toshaka <rinpatch@sdf.org>
Date: Sun, 30 Dec 2018 20:00:40 +0000 (+0100)
Subject: Resolve merge conflict
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=dec23500d8988c22a99f049ef1d1e49328ba075a;p=akkoma

Resolve merge conflict
---

dec23500d8988c22a99f049ef1d1e49328ba075a
diff --cc lib/pleroma/object.ex
index 99c836309,e2b648727..9a6c256df
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@@ -4,7 -4,7 +4,8 @@@
  
  defmodule Pleroma.Object do
    use Ecto.Schema
-   alias Pleroma.{Repo, Object, User, Activity, HTML}
++  alias Pleroma.{Repo, Object, User, Activity, HTML, ObjectTombstone}
+   alias Pleroma.{Repo, Object, User, Activity, ObjectTombstone}
    import Ecto.{Query, Changeset}
  
    schema "objects" do