Resolved merge

1c2715be · Kyle Fiedler · 3bab6142 · f6a38b72 · 3bab6142 · 1c2715be
Commit 1c2715be authored Feb 07, 2012 by Kyle Fiedler
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

images/askbot/vote-arrow-down.png
+0 -0

images/askbot/vote-arrow-up.png
+0 -0

images/sequence-nav/list-icon-current.png
+0 -0

No files found.
--- a/images/askbot/vote-arrow-down.png
+++ b/images/askbot/vote-arrow-down.png
--- a/images/askbot/vote-arrow-up.png
+++ b/images/askbot/vote-arrow-up.png
--- a/images/sequence-nav/list-icon-current.png
+++ b/images/sequence-nav/list-icon-current.png