diff options
| author | Guillaume Horel <guillaume.horel@gmail.com> | 2011-04-23 16:58:31 -0400 |
|---|---|---|
| committer | Guillaume Horel <guillaume.horel@gmail.com> | 2011-04-23 16:58:31 -0400 |
| commit | e7531d86ce53d86b1a0b2df9c25c25f98b95c715 (patch) | |
| tree | bc6778260b67652228c47e8263628087c8985967 /webclient/lib | |
| parent | 2b1ab3316033265f5dbedd880bd93d3f57cde5a1 (diff) | |
| download | alias-e7531d86ce53d86b1a0b2df9c25c25f98b95c715.tar.gz | |
Remove some stray comments from the botched merge.
Diffstat (limited to 'webclient/lib')
| -rw-r--r-- | webclient/lib/alias.js | 2 |
1 files changed, 0 insertions, 2 deletions
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 */ |