remove commit garbage
This commit is contained in:
@ -22,7 +22,6 @@ block content
|
|||||||
var userLoggedIn = true;
|
var userLoggedIn = true;
|
||||||
else
|
else
|
||||||
a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter)
|
a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter)
|
||||||
<<<<<<< HEAD
|
|
||||||
.button-spacer
|
.button-spacer
|
||||||
.btn-group.input-group.btn-group-justified
|
.btn-group.input-group.btn-group-justified
|
||||||
.btn.btn-success.btn-big#trigger-help-modal
|
.btn.btn-success.btn-big#trigger-help-modal
|
||||||
@ -36,8 +35,6 @@ block content
|
|||||||
| Bug
|
| Bug
|
||||||
if (!user)
|
if (!user)
|
||||||
.button-spacer
|
.button-spacer
|
||||||
=======
|
|
||||||
>>>>>>> staging
|
|
||||||
a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress
|
a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress
|
||||||
script.
|
script.
|
||||||
var userLoggedIn = false;
|
var userLoggedIn = false;
|
||||||
|
Reference in New Issue
Block a user