Changeset 16758


Ignore:
Timestamp:
Sep 8, 2017, 7:06:31 PM (2 years ago)
Author:
afernandes
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • internals/2017/FrontEndPlataformaSocial/Social_Plataform/client/styleshits/app.css

    r16756 r16758  
    66}
    77
     8<<<<<<< .mine
     9@font-face{
     10  font-family: "Century Gothic", serif; 
     11  font-style: normal;
     12  font-weight: 400;
     13||||||| .r16755
     14@font-face{
     15  font-family: "Century Gothic", serif;
     16=======
    817@font-face {
    918  font-family: 'Century Gothic';
    1019  font-style: normal;
    1120  font-weight: 400;
     21>>>>>>> .r16757
    1222  src: url("/fonts/font.ttf");
    1323}
Note: See TracChangeset for help on using the changeset viewer.