<<<<<<< HEAD @font-face{font-family:'adelleregularwebfont';src:url("./adelleregularwebfont.eot");src:local("adelleregularwebfont"),url("./adelleregularwebfont.woff") format("woff"),url("./adelleregularwebfont.ttf") format("truetype")}.fontsforweb_fontid_30477{font-family:'adelleregularwebfont' !important} ======= @font-face{font-family:'adelleregularwebfont';src:url('./adelleregularwebfont.eot');src:local('adelleregularwebfont'), url('./adelleregularwebfont.woff') format('woff'), url('./adelleregularwebfont.ttf') format('truetype');} .fontsforweb_fontid_30477{font-family:'adelleregularwebfont' !important;} >>>>>>> origin/master