import React, { Component } from 'react';
<<<<<<< HEAD
import { Header } from './components/parts/Header'
// require("./../stylesheet.css")




=======
import {Header} from './Header';
import {CreateOrEditForm} from './CreateOrEditForm';

const section = {
    borderLeft: "0.5px solid gray"
  , borderRight: "0.5px solid gray"
  ,padding: '8px'
}
>>>>>>> 615cdb6d5aeb34b8eeab99ad14baad472dd4b95f

export class App extends Component {
  render() {
    return (
<<<<<<< HEAD
      <div className="container">
        <Header />
        { this.props.children }
=======
      <div style={{ overflowX: 'scroll' }} >
        <Header/>

        <table style={{ position: 'absolute', top: '80px'}}>
          <thead>
            <tr>
              <td rowSpan="2" style={section}>Address</td>
              <td rowSpan="2" style={section}>Client Status</td>
              <td colSpan="3">Records on File</td>
              <td rowSpan="2" style={section}>NYC DOB APP#</td>
              <td colSpan="2" style={section}>Special Inspection Type</td>
              <td colSpan="2" style={section}>Copies of Initial Reports On File Date</td>
              <td rowSpan="2" style={section}>Date of Inspection</td>
              <td rowSpan="2" style={section}>Inspector Name</td>
              <td colSpan="2" style={section}>Type of Inspection</td>
              <td rowSpan="2" style={section}>Item Inspected</td>
              <td rowSpan="2" style={section}>Inspector Inspection Report on File</td>
              <td rowSpan="2" style={section}>Inspection Results</td>
              <td colSpan="2" style={section}>Copies of Final Reports on File</td>
              <td rowSpan="2" style={section}>Job Signed off Date</td>
            </tr>
            <tr>
              <td>Proposal</td>
              <td>Engagement Letter</td>
              <td>Invoice</td>
              <td>TR1</td>
              <td>TR8</td>
              <td>TR1</td>
              <td>TR8</td>
              <td>Progress</td>
              <td>Final</td>
              <td>TR1</td>
              <td>TR8</td>
            </tr>
          </thead>
        </table>
>>>>>>> 615cdb6d5aeb34b8eeab99ad14baad472dd4b95f
      </div>
    );
  }
}

@@ -35,29 +35,16 @@
 react';%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
 import %7B
@@ -89,299 +89,8 @@
 der'
-%0A// require(%22./../stylesheet.css%22)%0A%0A%0A%0A%0A=======%0Aimport %7BHeader%7D from './Header';%0Aimport %7BCreateOrEditForm%7D from './CreateOrEditForm';%0A%0Aconst section = %7B%0A    borderLeft: %220.5px solid gray%22%0A  , borderRight: %220.5px solid gray%22%0A  ,padding: '8px'%0A%7D%0A%3E%3E%3E%3E%3E%3E%3E 615cdb6d5aeb34b8eeab99ad14baad472dd4b95f
 %0A%0Aex
@@ -154,21 +154,8 @@
 n (%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
     
@@ -203,16 +203,16 @@
 ader /%3E%0A
+
         
@@ -239,1628 +239,8 @@
 n %7D%0A
-=======%0A      %3Cdiv style=%7B%7B overflowX: 'scroll' %7D%7D %3E%0A        %3CHeader/%3E%0A%0A        %3Ctable style=%7B%7B position: 'absolute', top: '80px'%7D%7D%3E%0A          %3Cthead%3E%0A            %3Ctr%3E%0A              %3Ctd rowSpan=%222%22 style=%7Bsection%7D%3EAddress%3C/td%3E%0A              %3Ctd rowSpan=%222%22 style=%7Bsection%7D%3EClient Status%3C/td%3E%0A              %3Ctd colSpan=%223%22%3ERecords on File%3C/td%3E%0A              %3Ctd rowSpan=%222%22 style=%7Bsection%7D%3ENYC DOB APP#%3C/td%3E%0A              %3Ctd colSpan=%222%22 style=%7Bsection%7D%3ESpecial Inspection Type%3C/td%3E%0A              %3Ctd colSpan=%222%22 style=%7Bsection%7D%3ECopies of Initial Reports On File Date%3C/td%3E%0A              %3Ctd rowSpan=%222%22 style=%7Bsection%7D%3EDate of Inspection%3C/td%3E%0A              %3Ctd rowSpan=%222%22 style=%7Bsection%7D%3EInspector Name%3C/td%3E%0A              %3Ctd colSpan=%222%22 style=%7Bsection%7D%3EType of Inspection%3C/td%3E%0A              %3Ctd rowSpan=%222%22 style=%7Bsection%7D%3EItem Inspected%3C/td%3E%0A              %3Ctd rowSpan=%222%22 style=%7Bsection%7D%3EInspector Inspection Report on File%3C/td%3E%0A              %3Ctd rowSpan=%222%22 style=%7Bsection%7D%3EInspection Results%3C/td%3E%0A              %3Ctd colSpan=%222%22 style=%7Bsection%7D%3ECopies of Final Reports on File%3C/td%3E%0A              %3Ctd rowSpan=%222%22 style=%7Bsection%7D%3EJob Signed off Date%3C/td%3E%0A            %3C/tr%3E%0A            %3Ctr%3E%0A              %3Ctd%3EProposal%3C/td%3E%0A              %3Ctd%3EEngagement Letter%3C/td%3E%0A              %3Ctd%3EInvoice%3C/td%3E%0A              %3Ctd%3ETR1%3C/td%3E%0A              %3Ctd%3ETR8%3C/td%3E%0A              %3Ctd%3ETR1%3C/td%3E%0A              %3Ctd%3ETR8%3C/td%3E%0A              %3Ctd%3EProgress%3C/td%3E%0A              %3Ctd%3EFinal%3C/td%3E%0A              %3Ctd%3ETR1%3C/td%3E%0A              %3Ctd%3ETR8%3C/td%3E%0A            %3C/tr%3E%0A          %3C/thead%3E%0A        %3C/table%3E%0A%3E%3E%3E%3E%3E%3E%3E 615cdb6d5aeb34b8eeab99ad14baad472dd4b95f%0A
     

resolve conflict merge in App.js