From 9c0a9847c2869e33307288e569f76666dea4e3eb Mon Sep 17 00:00:00 2001
From: Aaron Harsh <aaron.harsh@gmail.com>
Date: Mon, 16 Jan 2012 21:08:30 -0800
Subject: [PATCH 1/2] Fix merge conflict in deckbrowser drag&drop code

---
 aqt/deckbrowser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aqt/deckbrowser.py b/aqt/deckbrowser.py
index 97c99492f..71368e55d 100644
--- a/aqt/deckbrowser.py
+++ b/aqt/deckbrowser.py
@@ -123,7 +123,7 @@ body { margin: 1em; -webkit-user-select: none; }
         name, did, due, new, children = node
         def indent():
             return "&nbsp;"*3*depth
-        buf = "<tr>"
+        buf = "<tr class='deck' id='%d'>"% did
         # deck link
         buf += "<td colspan=5>%s<a class=deck href='open:%d'>%s</a></td>"% (
             indent(), did, name)

From 430a991f27f5a63c216af8d78e9da61056a00426 Mon Sep 17 00:00:00 2001
From: Aaron Harsh <aaron.harsh@gmail.com>
Date: Mon, 16 Jan 2012 21:27:15 -0800
Subject: [PATCH 2/2] Show drag marker as line between rows, rather than as row
 background

---
 aqt/deckbrowser.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/aqt/deckbrowser.py b/aqt/deckbrowser.py
index 71368e55d..0b7610ab7 100644
--- a/aqt/deckbrowser.py
+++ b/aqt/deckbrowser.py
@@ -52,8 +52,9 @@ class DeckBrowser(object):
 tr { font-size: 12px; }
 a.deck { color: #000; text-decoration: none; }
 a.deck:hover { text-decoration: underline; }
+tr.deck td { border-bottom: thick solid transparent; }
 td.opts { white-space: nowrap; }
-.drag-hover { background-color: #448; }
+tr.drag-hover td { border-bottom: thick solid #448; }
 .extra { font-size: 90%; }
 body { margin: 1em; -webkit-user-select: none; }
 """