From e7531d86ce53d86b1a0b2df9c25c25f98b95c715 Mon Sep 17 00:00:00 2001
From: Guillaume Horel <guillaume.horel@gmail.com>
Date: Sat, 23 Apr 2011 16:58:31 -0400
Subject: Remove some stray comments from the botched merge.

---
 webclient/lib/alias.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'webclient')

diff --git a/webclient/lib/alias.js b/webclient/lib/alias.js
index c6a7171..bae01cc 100644
--- a/webclient/lib/alias.js
+++ b/webclient/lib/alias.js
@@ -1,5 +1,3 @@
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
 /**
  * Alias namespace
  */
-- 
cgit v1.2.3-70-g09d2