diff options
Diffstat (limited to 'webclient')
| -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 */ |