| @@ -700,7 +700,11 @@ | |||
| </div><!-- end Services --> | |||
| <!--start teams--> | |||
| <<<<<<< HEAD | |||
| <!--<div id="teams-wrap"> | |||
| ======= | |||
| <div id="teams-wrap"> | |||
| >>>>>>> 4a9d59f25d66ae0a6182dfe2709e8312ca671896 | |||
| <div class="section-triangle-grey"></div> | |||
| <section class="general-section u-align-center u-clearfix u-custom-typography u-typography-custom-page-typography-38-Team u-white u-section-1" id="carousel_e6e6"> | |||
| <div class="u-clearfix u-sheet u-valign-middle u-sheet-1"> | |||
| @@ -787,7 +791,12 @@ | |||
| </div> | |||
| </div> | |||
| </section> | |||
| <<<<<<< HEAD | |||
| </div> --> | |||
| ======= | |||
| </div> | |||
| >>>>>>> 4a9d59f25d66ae0a6182dfe2709e8312ca671896 | |||
| <!--end teams--> | |||
| <div id="contact-section" class="home-section dark" style="background-image: url('images/contact_bg.png'); background-repeat: no-repeat; background-position: center 70px"> | |||