some

src/App.js

@@ -27,12 +27,7 @@ export class App extends React.Component {
     componentDidMount() {
         this.props.getDoctors();
         this.props.getServices();
-<<<<<<< HEAD
-        
-        // console.log (this.props.app)
-        
-=======
->>>>>>> ff3f53df4e902acee8dc75802682ebb15c73edfb
+
         // fetch ("https://api-clinics.herokuapp.com/api/v1/auth/login", {
         //     method : "POST",
         //     credentials: "include",

src/components/Admin/Shedule.js

@@ -35,13 +35,9 @@ export default class Shedule extends React.Component {
     };
 
     render() {
-<<<<<<< HEAD
-        console.log ( this.props )
-        const { doctors, postNewShedule,  setSheduleDoctor } = this.props;
-=======
         const {doctors, postNewShedule} = this.props;
-        const doctor = doctors.find(el => el._id === postNewShedule.doctor)
->>>>>>> ff3f53df4e902acee8dc75802682ebb15c73edfb
+        const doctor = doctors.find(el => el._id === postNewShedule.doctor);
+
         return (
             <div  className = "shedule-container" >
                 <div className = "option" >
@@ -75,5 +71,4 @@ export default class Shedule extends React.Component {
             </div>
         );
     }
-}
-// sheduleMonthArray,
+}