From 2cd279176d4aa8e08aeca6c002cfb70d3ad05a0e Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 1 Jul 2015 22:47:57 +0930
Subject: [PATCH] Not sure how these got in here...

---
 .../core/src copy/Core/Posts/EventPost.php    | 27 -------------------
 .../Core/Support/MergeableInterface.php       |  6 -----
 .../src copy/Core/Support/MergeableTrait.php  | 23 ----------------
 3 files changed, 56 deletions(-)
 delete mode 100755 framework/core/src copy/Core/Posts/EventPost.php
 delete mode 100644 framework/core/src copy/Core/Support/MergeableInterface.php
 delete mode 100644 framework/core/src copy/Core/Support/MergeableTrait.php

diff --git a/framework/core/src copy/Core/Posts/EventPost.php b/framework/core/src copy/Core/Posts/EventPost.php
deleted file mode 100755
index 6c392b29c..000000000
--- a/framework/core/src copy/Core/Posts/EventPost.php	
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php namespace Flarum\Core\Models;
-
-abstract class EventPost extends Post implements MergeableInterface
-{
-    use MergeableTrait;
-
-    /**
-     * Unserialize the content attribute.
-     *
-     * @param  string  $value
-     * @return string
-     */
-    public function getContentAttribute($value)
-    {
-        return json_decode($value, true);
-    }
-
-    /**
-     * Serialize the content attribute.
-     *
-     * @param  string  $value
-     */
-    public function setContentAttribute($value)
-    {
-        $this->attributes['content'] = json_encode($value);
-    }
-}
diff --git a/framework/core/src copy/Core/Support/MergeableInterface.php b/framework/core/src copy/Core/Support/MergeableInterface.php
deleted file mode 100644
index 2a6c81ccf..000000000
--- a/framework/core/src copy/Core/Support/MergeableInterface.php	
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php namespace Flarum\Core\Models;
-
-interface MergeableInterface
-{
-    public function saveAfter(Model $previous);
-}
diff --git a/framework/core/src copy/Core/Support/MergeableTrait.php b/framework/core/src copy/Core/Support/MergeableTrait.php
deleted file mode 100644
index 04ddc79f8..000000000
--- a/framework/core/src copy/Core/Support/MergeableTrait.php	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php namespace Flarum\Core\Models;
-
-trait MergeableTrait
-{
-    public function saveAfter(Model $previous)
-    {
-        if ($previous instanceof static) {
-            if ($merged = $this->mergeInto($previous)) {
-                $merged->save();
-                return $merged;
-            } else {
-                $previous->delete();
-                return $previous;
-            }
-        }
-
-        $this->save();
-
-        return $this;
-    }
-
-    abstract protected function mergeInto(Model $previous);
-}