merge

Author: Alvaro Vargas

src/app/courses/services/courses.service.ts

@@ -3,10 +3,6 @@
 import {Injectable} from "@angular/core";
 import {HttpClient, HttpParams} from "@angular/common/http";
 import {Observable} from "rxjs";
-<<<<<<< HEAD
-=======
-import {Course} from "../model/course";
->>>>>>> origin/1-start
 import {map} from "rxjs/operators";
 import {Lesson} from "../model/lesson";
 import {Course} from '../model/course';
@@ -30,10 +26,6 @@ export class CoursesService {
             );
     }
 
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/1-start
     saveCourse(courseId:number, changes: Partial<Course>): Observable<Course> {
         return this.http.put<Course>(`/api/courses/${courseId}`, changes);
     }