app.component.html

<div id="top-container">
<<<<<<< HEAD
    <div id="left-menu">
      <router-outlet name="left-menu"></router-outlet>
    </div>
  
    <div id="contentarea">
      <div id="topbar">
        <top-menu></top-menu>
      </div>
      <div id="content">
        <router-outlet></router-outlet>
      </div>
=======
  <div id="left-menu">
    <router-outlet name="left-menu"></router-outlet>
  </div>

  <div id="contentarea">
    <div id="topbar">
      <top-menu></top-menu>
      <moya-locale></moya-locale>
    </div>
    <div id="content">

      <router-outlet></router-outlet>
>>>>>>> 1cbc86e7a97395b4e066423d4e947bd68e293b1d
    </div>
  </div>