diff options
| author | Guillaume Horel <guillaume.horel@gmail.com> | 2011-04-23 16:52:45 -0400 |
|---|---|---|
| committer | Guillaume Horel <guillaume.horel@gmail.com> | 2011-04-23 16:52:45 -0400 |
| commit | 2b1ab3316033265f5dbedd880bd93d3f57cde5a1 (patch) | |
| tree | 81ea7ec2a552357d8928a4e72c55dcf73525299d /webclient/lib | |
| parent | 7a440ab19f974948f5958f7ebc0df826e98e5cfb (diff) | |
| download | alias-2b1ab3316033265f5dbedd880bd93d3f57cde5a1.tar.gz | |
Add option to run server in the background.
Diffstat (limited to 'webclient/lib')
| -rw-r--r-- | webclient/lib/alias.js | 2 |
1 files changed, 2 insertions, 0 deletions
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 */ |