Refactor of timeouts

alex-seville · Mar 15, 2013 · f64806c · f64806c
1 parent 7bb7ac3
commit f64806c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -43,4 +43,5 @@ OR
 -refactor timeouts in test  
 -mock host objects in test (alert, confirm) and add pass throughs to feta for them, but also add option to not do that  
 -more qunit tests for lib/feta.js
+-bug when selecting a second test in sidebar, possibly related to id
 
diff --git a/dist/Panel.html b/dist/Panel.html
@@ -31,11 +31,7 @@
               </ol>
             </ol>
           </div>
-<<<<<<< HEAD
           <div id="sidePanel" class="split-view-contents split-view-contents-vertical" style="right: 0px; left: 200px;">
-=======
-          <div id="splitPanel" class="split-view-contents split-view-contents-vertical" style="right: 0px; left: 200px;">
->>>>>>> working on sidebar expansion
             <div class="audit-launcher-view panel-enabler-view visible">
               <div  class="audit-launcher-view-content">
                 <div id="admin">

diff --git a/dist/devtoolsjs/fetaSource.js b/dist/devtoolsjs/fetaSource.js
diff --git a/lib/feta.js b/lib/feta.js