a few more merge items

Author: jrosengrant

src/app/components/Diff.tsx

@@ -80,7 +80,6 @@
 //     return newObj; // return the cleaned state snapshot(s)
 //   };
 
-<<<<<<< HEAD
 //   const previousDisplay: StatelessCleaning = statelessCleaning(previous); // displays stateful data from the first snapshot that was taken before our current snapshot.
 
 //   const delta: StatelessCleaning = diff(previousDisplay, snapshot); // diff function from 'jsondiffpatch' returns the difference in state between 'previousDisplay' and 'snapshot'
@@ -90,24 +89,6 @@
 //   if (show)
 //     formatters.html.showUnchanged(); // shows unchanged values if we're on the '/diffRaw' path
 //   else formatters.html.hideUnchanged(); // hides unchanged values
-=======
-  // console.log('previousDisplay before stateless cleaning: ', previous);
-  const previousDisplay: StatelessCleaning = statelessCleaning(previous); // displays stateful data from the first snapshot that was taken before our current snapshot.
-
-  // console.log('previousDisplay after stateless cleaning: ', previousDisplay);
-  const delta: StatelessCleaning = diff(previousDisplay, snapshot); // diff function from 'jsondiffpatch' returns the difference in state between 'previousDisplay' and 'snapshot'
-
-  // console.log('delta: ', delta);
-  const html: StatelessCleaning = formatters.html.format(delta, previousDisplay); // formatters function from 'jsondiffpatch' returns an html string that shows the difference between delta and the previousDisplay
-
-  // console.log('html: ', html);
-
-  console.log(show);
-  console.log(formatters.html.showUnchanged());
-  if (show)
-    formatters.html.showUnchanged(); // shows unchanged values if we're on the '/diffRaw' path
-  else formatters.html.hideUnchanged(); // hides unchanged values
->>>>>>> errors
 
 //   if (previous === undefined || delta === undefined) {
 //     // if there has been no state changes on the target/hooked application, previous and delta would be undefined.

src/app/components/DiffRoute.tsx

@@ -7,7 +7,6 @@
 //   Loads the appropriate DiffRoute view and renders the 'Tree' and 'Raw' navbar buttons after clicking on the 'Diff' button located near the top rightmost corner.
 // */
 
-<<<<<<< HEAD
 // // 'DiffRoute' only passed in prop is 'snapshot' from 'tabs[currentTab]' object in 'MainContainer'
 // const DiffRoute = (props: DiffRouteProps): JSX.Element => (
 //   <Router>
@@ -25,24 +24,5 @@
 //     </Routes>
 //   </Router>
 // );
-=======
-// 'DiffRoute' only passed in prop is 'snapshot' from 'tabs[currentTab]' object in 'MainContainer'
-const DiffRoute = (props: DiffRouteProps): JSX.Element => (
-  <Router>
-    <div className='navbar'>
-      <NavLink className='router-link' activeClassName='is-active' exact to='/'>
-        Tree
-      </NavLink>
-      <NavLink className='router-link' activeClassName='is-active' to='/diffRaw'>
-        Raw
-      </NavLink>
-    </div>
-    <Switch>
-      <Route path='/diffRaw' render={() => <Diff snapshot={props.snapshot} />} />
-      <Route path='/' render={() => <Diff snapshot={props.snapshot} show={false} />} />
-    </Switch>
-  </Router>
-);
->>>>>>> errors
 
 // export default DiffRoute;

src/app/components/StateRoute/ComponentMap/ComponentMap.tsx

@@ -127,12 +127,8 @@ export default function ComponentMap({
   };
 
   const formatRenderTime: string = (time: number): string => {
-<<<<<<< HEAD
-    const renderTime = parseFloat(time).toFixed(3);
-=======
     if (!time) return 'No time information';
     const renderTime = time.toFixed(3);
->>>>>>> errors
     return `${renderTime} ms `;
   };