Download as
Browse Code »

Commit 14a19b72d3880bf979829087bbcac5fb8170f437

Authored by Leandro Santos
1 parent 6533f507
Exists in master and in 11 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, session_cookie, staging

fix conflit with proposal_categories file

Showing 1 changed file with 0 additions and 8 deletions   Show diff stats
sass/_proposal_categories.scss
  Diff comments   View file @14a19b7
@@ -74,20 +74,12 @@ @@ -74,20 +74,12 @@
74 font-size: 18pt; 74 font-size: 18pt;
75 font-weight: bold; 75 font-weight: bold;
76 text-decoration: none; 76 text-decoration: none;
77 -<<<<<<< HEAD  
78 - background: #fff;  
79 -=======  
80 ->>>>>>> 450d03f922b650755bff80ce172cd13d76d06632  
81 } 77 }
82 78
83 .proposal-item { 79 .proposal-item {
84 width: 46%; 80 width: 46%;
85 height: 134px; 81 height: 134px;
86 -<<<<<<< HEAD  
87 - margin: 10px 30px;  
88 -=======  
89 margin: 0.5%; 82 margin: 0.5%;
90 ->>>>>>> 450d03f922b650755bff80ce172cd13d76d06632  
91 background: #fff; 83 background: #fff;
92 border-radius: 5px; 84 border-radius: 5px;
93 padding: 15px; 85 padding: 15px;