Commit 78a76c4daeeba8edee4dfcba2ac6ed5c6d3877ce

  • Tree SHA1: bceade5
  • Parent SHA1: f65e1fa (Merge branch 'master' of git.pantoto.org:karnataka-hybrid-micro-devices-ltd-khmdl-website/khmdl-website)
  • raw diff | raw patch 
Fix illegal character in main.css during resolving conflicts
  • Diff rendering mode:
  • inline
  • side by side

mouchak/static/css/main.css

94font-size: 24px;94font-size: 24px;
95padding: 5px 1px 2px 0px;95padding: 5px 1px 2px 0px;
96margin: 5px 1px 8px 1px;96margin: 5px 1px 8px 1px;
97=======
97}
98.navigation-style.col-md-10 {98.navigation-style.col-md-10 {
99 padding-left: 0;99 padding-left: 0;
100 padding-right: 0;100 padding-right: 0;