Merge issue reverted

sridharpg · Dec 14, 2012 · 78252ed · 78252ed
1 parent e5a901a
commit 78252ed
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/app/index.html b/app/index.html
@@ -3,15 +3,7 @@
     <head>
         <title>Quiz</title>
     </head>
-<<<<<<< HEAD
     <body class='quiz-body' ng-init="loadLang()">
-
-    <select data-ng-change="selectAction()" data-ng-model="selected" data-ng-options="l.id as l.label for l in languages"></select>
-
-    <div data-ng-view></div>
-
-=======
-    <body class='quiz-body'>
         <div id="floating-toolbar">
             <select id="language-select" data-ng-change="selectAction()"data-ng-model="selected" data-ng-options="l.id as l.label for l in languages"></select>
             <div ng-controller="ThemeCtrl" class="theme-bar">
@@ -21,7 +13,6 @@
         </div>
 
         <div data-ng-view></div>
->>>>>>> 6c8c2b6b76a971ce89d0c6d334f6230bcc6e300d
         <script src="js/thirdparty/jquery-1.8.3.js"></script>
         <script src="js/thirdparty/angular.js"></script>
         <script src="js/thirdparty/angular-resource.js"></script>