From d2c5e6afa1072d1e16e3ecef5fe42bdf3c5c59ed Mon Sep 17 00:00:00 2001
From: bsimpson63 <bsimpson63@gmail.com>
Date: Sat, 3 Nov 2012 20:52:57 -0400
Subject: [PATCH] Delete merge conflict remnants.

---
 r2/r2/lib/promote.py | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/r2/r2/lib/promote.py b/r2/r2/lib/promote.py
index 99b3c259f..5ee506ba5 100644
--- a/r2/r2/lib/promote.py
+++ b/r2/r2/lib/promote.py
@@ -896,37 +896,6 @@ def get_total_run(link):
     return earliest, latest
 
 
-<<<<<<< HEAD
-class PromotionLog(tdb_cassandra.View):
-    _use_db = True
-    _connection_pool = 'main'
-    _compare_with = TIME_UUID_TYPE
-
-    @classmethod
-    def _rowkey(cls, link):
-        return link._fullname
-
-    @classmethod
-    def add(cls, link, text):
-        name = c.user.name if c.user_is_loggedin else "<AUTOMATED>"
-        now = datetime.now(g.tz).strftime("%Y-%m-%d %H:%M:%S")
-        text = "[%s: %s] %s" % (name, now, text)
-        rowkey = cls._rowkey(link)
-        column = {uuid1(): filters._force_utf8(text)}
-        cls._set_values(rowkey, column)
-        return text
-
-    @classmethod
-    def get(cls, link):
-        rowkey = cls._rowkey(link)
-        try:
-            row = cls._byID(rowkey)
-        except tdb_cassandra.NotFound:
-            return []
-        tuples = sorted(row._values().items(), key=lambda t: t[0].time)
-        return [t[1] for t in tuples]
-
-
 def Run(offset = 0):
     """reddit-job-update_promos: Intended to be run hourly to pull in
     scheduled changes to ads