diff options
| author | HumairAK <humair88@hotmail.com> | 2016-07-25 03:29:23 +0000 |
|---|---|---|
| committer | HumairAK <humair88@hotmail.com> | 2016-07-25 03:29:23 +0000 |
| commit | 7c222d2418ba44bd4f2f9ffd844f97f43974029a (patch) | |
| tree | a8282098bea1a18312fda510d8f635f3dd97eee1 /views | |
| parent | fc3cc6aee7ce7a28539d332902c0f9923d298c71 (diff) | |
| parent | 3ca0e78b313a1bded021cbb8b2dad241d7cad049 (diff) | |
fixed conflict
Diffstat (limited to 'views')
| -rw-r--r-- | views/user_profile_alt.hbs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/views/user_profile_alt.hbs b/views/user_profile_alt.hbs index ab6a9ce..2f10e66 100644 --- a/views/user_profile_alt.hbs +++ b/views/user_profile_alt.hbs @@ -151,15 +151,15 @@ col-sm-offset-0 col-md-offset-3 col-lg-offset-3 toppad prf-details"> </table> </div> </div> - {{# if success }} + {{# if messages.success }} <section class="alert alert-success"> <!-- Change those to banners later --> - <h2>{{ success }}</h2> + <h3>{{ messages.success }}</h3> </section> {{ else }} - {{# if error }} + {{# if messages.error }} <section class="alert alert-danger"> - <h2>{{ error }}</h2> + <h3>{{ messages.error }}</h3> </section> {{/if}} {{/if}} |