From 263d1369930bfb01707d2d35856c5ab79d0716a4 Mon Sep 17 00:00:00 2001 From: remmy poos Date: Tue, 17 Feb 2015 22:17:01 +0800 Subject: [PATCH] fixes #4696 sorry, a billion things to learn about git this code -should- work tested locally --- website/views/shared/profiles/achievements.jade | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index 9b35d57d5e..0c851b5d4d 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -129,26 +129,14 @@ div(ng-if='::profile.achievements.helpedHabit') +aLink('http://community.habitrpg.com/node/290', env.t('helpedText2')) hr -<<<<<<< HEAD -div(ng-if='profile.achievements.veteran') - .achievement.achievement-alpha -======= div(ng-if=':: profile.achievements.veteran') .achievement.achievement-cake ->>>>>>> 7a08ff360f988a02b96417b2040b5d806b426101 div(ng-if='::profile.achievements.veteran') h5=env.t('veteran') small=env.t('veteranText') - div(ng-if='::profile.achievements.originalUser') - h5=env.t('originalUser') - small!=env.t('originalUserText') hr -<<<<<<< HEAD -div(ng-if='::profile.achievements.originalUser') -======= div(ng-if=':: profile.achievements.originalUser') ->>>>>>> 7a08ff360f988a02b96417b2040b5d806b426101 .achievement.achievement-alpha div(ng-if='::profile.achievements.originalUser') h5=env.t('originalUser')