Skip to content

Commit 0821cfa

Browse files
rpiazzarpiazza
committed
more merge issues
1 parent e960eec commit 0821cfa

File tree

7 files changed

+0
-199
lines changed

7 files changed

+0
-199
lines changed

‎extension-definition-specifications/incident-ef7/examples/.#incident_expo_1.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎extension-definition-specifications/incident-ef7/examples/incident_expo_2.json‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,7 @@
363363
"result_ref": "impact--d16ffd9c-4d83-46d5-b6ac-626ada44458c"
364364
}
365365
],
366-
<<<<<<< HEAD
367-
"next_tasks_refs": [
368-
=======
369366
"next_task_refs": [
370-
>>>>>>> impacts-without-an-ext
371367
"task--f5ea62cf-bcbb-47cd-bc52-42cadd1afbeb",
372368
"task--88f6cf01-c575-425e-a304-d842edb91bfa"
373369
],
@@ -421,11 +417,7 @@
421417
"start_time_fidelity": "hour",
422418
"end_time": "2022-09-14T18:00:00.000Z",
423419
"end_time_fidelity": "hour",
424-
<<<<<<< HEAD
425-
"next_tasks_refs": [
426-
=======
427420
"next_task_refs": [
428-
>>>>>>> impacts-without-an-ext
429421
"task--6ef78c95-3b5d-4b8d-88c7-a90625cf7a5d"
430422
],
431423
"extensions": {
@@ -466,11 +458,7 @@
466458
"outcome": "successful",
467459
"start_time": "2022-09-14T23:00:00.000Z",
468460
"start_time_fidelity": "hour",
469-
<<<<<<< HEAD
470-
"next_tasks_refs": [
471-
=======
472461
"next_task_refs": [
473-
>>>>>>> impacts-without-an-ext
474462
"task--993a1e68-8b5c-4f0e-aef7-75c31b85df3e"
475463
],
476464
"extensions": {
@@ -536,11 +524,7 @@
536524
"start_time_fidelity": "hour",
537525
"end_time": "2022-09-15T05:00:00.000Z",
538526
"end_time_fidelity": "hour",
539-
<<<<<<< HEAD
540-
"next_tasks_refs": [
541-
=======
542527
"next_task_refs": [
543-
>>>>>>> impacts-without-an-ext
544528
"task--6998596d-28f5-4670-af86-3bc168df1854"
545529
],
546530
"extensions": {

‎extension-definition-specifications/incident-ef7/examples/incident_expo_3.json‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -355,12 +355,7 @@
355355
"start_time": "2022-09-02T22:00:00.000Z",
356356
"start_time_fidelity": "day",
357357
"end_time": "2022-09-04T22:00:00.000Z",
358-
"end_time_fidelity": "day",
359-
<<<<<<< HEAD
360-
"next_events_refs": [
361-
=======
362358
"next_event_refs": [
363-
>>>>>>> impacts-without-an-ext
364359
"event--71c21ab1-053d-4455-ac41-90b3bc5e5a1f"
365360
],
366361
"extensions": {
@@ -420,12 +415,7 @@
420415
"start_time_fidelity": "day",
421416
"end_time": "2022-09-13T22:00:00.000Z",
422417
"end_time_fidelity": "day",
423-
424-
<<<<<<< HEAD
425-
"next_events_refs": [
426-
=======
427418
"next_event_refs": [
428-
>>>>>>> impacts-without-an-ext
429419
"event--4054c4eb-8794-4d7e-a2c7-7bb4dd9c1fbf",
430420
"event--7366ca2b-45af-4112-b352-4e0acc4ee22b",
431421
"event--c53aef43-05b1-4e09-8f61-73ac307eb36a",
@@ -604,11 +594,7 @@
604594
"start_time_fidelity": "minute",
605595
"end_time": "2022-09-15T10:00:00.000Z",
606596
"end_time_fidelity": "hour",
607-
<<<<<<< HEAD
608-
"next_events_refs": [
609-
=======
610597
"next_event_refs": [
611-
>>>>>>> impacts-without-an-ext
612598
"event--20cfb071-a62f-4f94-a188-96d39af43a8c",
613599
"event--219d4b8d-6665-4aee-9387-dc1a475e2996",
614600
"event--875dbd12-ed65-44c8-924b-e28354cbc2f5",
@@ -636,11 +622,7 @@
636622
"start_time_fidelity": "day",
637623
"end_time": "2022-09-15T10:00:00.000Z",
638624
"end_time_fidelity": "day",
639-
<<<<<<< HEAD
640-
"next_events_refs": [
641-
=======
642625
"next_event_refs": [
643-
>>>>>>> impacts-without-an-ext
644626
"event--875dbd12-ed65-44c8-924b-e28354cbc2f5"
645627
],
646628
"extensions": {
@@ -675,11 +657,7 @@
675657
"start_time_fidelity": "day",
676658
"end_time": "2022-09-15T10:00:00.000Z",
677659
"end_time_fidelity": "day",
678-
<<<<<<< HEAD
679-
"next_events_refs": [
680-
=======
681660
"next_event_refs": [
682-
>>>>>>> impacts-without-an-ext
683661
"event--875dbd12-ed65-44c8-924b-e28354cbc2f5"
684662
],
685663
"extensions": {
@@ -719,11 +697,7 @@
719697
"start_time_fidelity": "day",
720698
"end_time": "2022-09-15T10:00:00.000Z",
721699
"end_time_fidelity": "day",
722-
<<<<<<< HEAD
723-
"next_events_refs": [
724-
=======
725700
"next_event_refs": [
726-
>>>>>>> impacts-without-an-ext
727701
"event--2cf8b0a6-76d0-4d76-b015-f7c4c741b0fa"
728702
],
729703
"extensions": {
@@ -816,11 +790,7 @@
816790
"result_ref": "impact--d16ffd9c-4d83-46d5-b6ac-626ada44458c"
817791
}
818792
],
819-
<<<<<<< HEAD
820-
"next_tasks_refs": [
821-
=======
822793
"next_task_refs": [
823-
>>>>>>> impacts-without-an-ext
824794
"task--f5ea62cf-bcbb-47cd-bc52-42cadd1afbeb",
825795
"task--88f6cf01-c575-425e-a304-d842edb91bfa"
826796
],
@@ -876,11 +846,7 @@
876846
"start_time_fidelity": "hour",
877847
"end_time": "2022-09-14T18:00:00.000Z",
878848
"end_time_fidelity": "hour",
879-
<<<<<<< HEAD
880-
"next_tasks_refs": [
881-
=======
882849
"next_task_refs": [
883-
>>>>>>> impacts-without-an-ext
884850
"task--6ef78c95-3b5d-4b8d-88c7-a90625cf7a5d"
885851
],
886852
"extensions": {
@@ -922,11 +888,7 @@
922888
"outcome": "successful",
923889
"start_time": "2022-09-14T23:00:00.000Z",
924890
"start_time_fidelity": "hour",
925-
<<<<<<< HEAD
926-
"next_tasks_refs": [
927-
=======
928891
"next_task_refs": [
929-
>>>>>>> impacts-without-an-ext
930892
"task--993a1e68-8b5c-4f0e-aef7-75c31b85df3e"
931893
],
932894
"extensions": {
@@ -950,11 +912,7 @@
950912
"start_time_fidelity": "hour",
951913
"end_time": "2022-09-15T00:00:00.000Z",
952914
"end_time_fidelity": "hour",
953-
<<<<<<< HEAD
954-
"next_tasks_refs": [
955-
=======
956915
"next_task_refs": [
957-
>>>>>>> impacts-without-an-ext
958916
"task--980ddd0f-5863-4464-b12e-105e6255eef1"
959917
],
960918
"extensions": {
@@ -999,11 +957,7 @@
999957
"start_time_fidelity": "hour",
1000958
"end_time": "2022-09-15T05:00:00.000Z",
1001959
"end_time_fidelity": "hour",
1002-
<<<<<<< HEAD
1003-
"next_tasks_refs": [
1004-
=======
1005960
"next_task_refs": [
1006-
>>>>>>> impacts-without-an-ext
1007961
"task--6998596d-28f5-4670-af86-3bc168df1854"
1008962
],
1009963
"extensions": {
@@ -1034,11 +988,7 @@
1034988
"result_ref": "impact--e335ce90-039a-49d3-a843-013019c0a074"
1035989
}
1036990
],
1037-
<<<<<<< HEAD
1038-
"next_tasks_refs": [
1039-
=======
1040991
"next_task_refs": [
1041-
>>>>>>> impacts-without-an-ext
1042992
"task--5e0ce2e7-d603-4c5b-bcde-ded2821c0c8a"
1043993
],
1044994
"extensions": {
@@ -1061,11 +1011,7 @@
10611011
"start_time_fidelity": "hour",
10621012
"end_time": "2022-09-15T13:00:00.000Z",
10631013
"end_time_fidelity": "hour",
1064-
<<<<<<< HEAD
1065-
"next_tasks_refs": [
1066-
=======
10671014
"next_task_refs": [
1068-
>>>>>>> impacts-without-an-ext
10691015
"task--583b5df2-4665-4595-9a10-ed8ddbc18c0f"
10701016
],
10711017
"extensions": {
@@ -1108,11 +1054,7 @@
11081054
"start_time_fidelity": "hour",
11091055
"end_time": "2022-09-15T21:00:00.000Z",
11101056
"end_time_fidelity": "hour",
1111-
<<<<<<< HEAD
1112-
"next_tasks_refs": [
1113-
=======
11141057
"next_task_refs": [
1115-
>>>>>>> impacts-without-an-ext
11161058
"task--88f6cf01-c575-425e-a304-d842edb91bfa"
11171059
],
11181060
"changed_objects": [

0 commit comments

Comments
 (0)