From 2b1ab3316033265f5dbedd880bd93d3f57cde5a1 Mon Sep 17 00:00:00 2001
From: Guillaume Horel <guillaume.horel@gmail.com>
Date: Sat, 23 Apr 2011 16:52:45 -0400
Subject: Add option to run server in the background.

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

(limited to 'webclient/lib/alias.js')

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