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