Commit 0e8e96f67e38553f1c299b8ae532e4c871eeb8ea

Anon Ray
Mon Mar 24 20:45:33 IST 2014

Tree SHA1: 3c68517
Parent SHA1: 1e67808 (Add new icons)
raw diff | raw patch

Fix conflict characters in main.css

Diff rendering mode:
inline
side by side


	73	73	margin-top: 5%;
	74	74	}
	75	75
	76		<<<<<<< HEAD
	77		a, a:hover, a:active {
	78		=======
	79	76	#main-icons {
	80	77	margin-top: 30px;
	81	78	}
	82	79
	83	80	a, a:hover, a:active{
	84		>>>>>>> 5c07767178533711f1d76ca6b19129a8da67fb9f
	85	81	color:#262525;
	86	82	}
	87	83	/*.navbar-default {