Skip to content
Snippets Groups Projects
Commit dc8f4e34 authored by Diego Sampaio's avatar Diego Sampaio
Browse files

fix merge mess =P

parent 95453405
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
packages/rocketchat-livechat/app/client/views/room.html
+ 7
− 6
View file @ dc8f4e34
...@@ -10,14 +10,15 @@ ...@@ -10,14 +10,15 @@
</div> </div>
<h1>{{title}}</h1> <h1>{{title}}</h1>
</div> </div>
{{#if currentUser}}
{{> messages}} {{#if livechatEnabled}}
{{else}} {{#if showMessages}}
{{#if livechatEnabled}} {{> messages}}
{{> register}}
{{else}} {{else}}
<div class="offline">{{_ "We_are_offline_Sorry_for_the_inconvenience"}}</div> {{> register}}
{{/if}} {{/if}}
{{else}}
<div class="offline">{{_ "We_are_offline_Sorry_for_the_inconvenience"}}</div>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment