Merge conflict in SCSS file

[benorgan]

rethink-spring-2019/themes/rcforward/sass/_content.scss

Lines 69 to 96 in 307420d

	<<<<<<< HEAD
	/* Chimp Donate Button */
	.chimp-donate-form {
	background: $code__blue;
	margin-top: 10px;
	width: 160px;
	height: 60px;
	border-radius: 6px;
	color: $grounded__green;
	font-weight: bold;
	}
	=======
	/* Chimp Donate Button */
	.chimp-donate-form {
	background-color: $code__blue;
	font-size: 1.6rem;
	font-weight: 700;
	padding: 1.6rem 5.3rem;
	color: $grounded__green;
	border-radius: 8px;
	margin-top: 10px;
	@include tablet {
	}
	@include desktop {
	}
	}
	>>>>>>> c590575265e0bcd82d5845260c2817245a4e37b3

You have a merge conflict here which hasn't been resolved and will be causing issues with your SASS compilation. This would happen when you do git pull, you should ensure you check the terminal output when you run this command as it will give you an error message if there is a merge conflict. These conflicts need to be resolved and the flags in the code removed before you do a git add

[benorgan]

You also have a conflict in _variables.scss