Merge branch 'master' into opensource_final

Change-Id: Ia4987713488321097e11c738b4b50c01cb027020 GitOrigin-RevId: 5a55be0f70304f3cb10dda95ee70d4507f4f02eb
verilylifesciences · Jul 1, 2019 · 42e9075 · 42e9075
1 parent 76027c5
commit 42e9075
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 2 deletions.
diff --git a/...omizable-timeline/customizable-timeline-dialog/customizable-timeline-dialog.component.css b/...omizable-timeline/customizable-timeline-dialog/customizable-timeline-dialog.component.css
@@ -115,4 +115,4 @@ ngb-timepicker {
 
 ::ng-deep .mat-dialog-container {
   max-height: 400px !important;
-}
+}
diff --git a/...mizable-timeline/customizable-timeline-dialog/customizable-timeline-dialog.component.html b/...mizable-timeline/customizable-timeline-dialog/customizable-timeline-dialog.component.html
@@ -38,4 +38,4 @@
       <button [disabled]="findIncompleteFields()" mat-raised-button (click)="onSave()" color="primary"
         id="saveButton">Save</button>
     </div>
-  </div>
+  </div>
diff --git a/medtimeline/src/assets/documents/ifu_1.png b/medtimeline/src/assets/documents/ifu_1.png
diff --git a/medtimeline/src/assets/documents/ifu_10.png b/medtimeline/src/assets/documents/ifu_10.png
diff --git a/medtimeline/src/assets/documents/ifu_11.png b/medtimeline/src/assets/documents/ifu_11.png
diff --git a/medtimeline/src/assets/documents/ifu_12.png b/medtimeline/src/assets/documents/ifu_12.png
diff --git a/medtimeline/src/assets/documents/ifu_13.png b/medtimeline/src/assets/documents/ifu_13.png
diff --git a/medtimeline/src/assets/documents/ifu_14.png b/medtimeline/src/assets/documents/ifu_14.png
diff --git a/medtimeline/src/assets/documents/ifu_2.png b/medtimeline/src/assets/documents/ifu_2.png
diff --git a/medtimeline/src/assets/documents/ifu_3.png b/medtimeline/src/assets/documents/ifu_3.png
diff --git a/medtimeline/src/assets/documents/ifu_4.png b/medtimeline/src/assets/documents/ifu_4.png
diff --git a/medtimeline/src/assets/documents/ifu_5.png b/medtimeline/src/assets/documents/ifu_5.png
diff --git a/medtimeline/src/assets/documents/ifu_6.png b/medtimeline/src/assets/documents/ifu_6.png
diff --git a/medtimeline/src/assets/documents/ifu_7.png b/medtimeline/src/assets/documents/ifu_7.png
diff --git a/medtimeline/src/assets/documents/ifu_8.png b/medtimeline/src/assets/documents/ifu_8.png
diff --git a/medtimeline/src/assets/documents/ifu_9.png b/medtimeline/src/assets/documents/ifu_9.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,4 +115,4 @@ ngb-timepicker { @@
     ::ng-deep .mat-dialog-container {
       max-height: 400px !important;
-    }
+    }