cleaning up conflicts

models/_models.yml

@@ -43,17 +43,10 @@ models:
  schema: elation_stage
  alias: lab_result
 
-<<<<<<< HEAD
  - name: elation_stage__medication_fill
  config:
  schema: elation_stage
  alias: medication_fill
-=======
- - name: elation_stage__medication
- config:
- schema: elation_stage
- alias: medication
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
 
  - name: elation_stage__misc_orders
  config:
@@ -114,21 +107,13 @@ models:
 
  - name: elation_core__allergy
  config:
-<<<<<<< HEAD
  schema: core_stage
-=======
- schema: elation_core
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
  alias: allergy
  materialized: table
 
  - name: elation_core__appointment
  config:
-<<<<<<< HEAD
  schema: core_stage
-=======
- schema: elation_core
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
  alias: appointment
  materialized: table
 
@@ -144,19 +129,11 @@ models:
  - name: patient_id
  tests:
  - not_null
-<<<<<<< HEAD
  - name: source_description
  tests:
  - not_null
  config:
  schema: core_stage
-=======
- - name: source_code
- tests:
- - not_null
- config:
- schema: elation_core
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
  alias: condition
 
  - name: elation_core__encounter
@@ -175,11 +152,7 @@ models:
  tests:
  - not_null
  config:
-<<<<<<< HEAD
  schema: core_stage
-=======
- schema: elation_core
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
  alias: encounter
 
  - name: elation_core__lab_result
@@ -194,29 +167,17 @@ models:
  - name: patient_id
  tests:
  - not_null
-<<<<<<< HEAD
  - name: source_description
  tests:
  - not_null
  config:
  schema: core_stage
-=======
- - name: source_code
- tests:
- - not_null
- config:
- schema: elation_core
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
  alias: lab_result
  materialized: table
 
  - name: elation_core__location
  config:
-<<<<<<< HEAD
  schema: core_stage
-=======
- schema: elation_core
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
  alias: location
 
  - name: elation_core__medication
@@ -231,19 +192,11 @@ models:
  - name: patient_id
  tests:
  - not_null
-<<<<<<< HEAD
  - name: source_description
  tests:
  - not_null
  config:
  schema: core_stage
-=======
- - name: source_code
- tests:
- - not_null
- config:
- schema: elation_core
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
  alias: medication
  materialized: table
 
@@ -259,19 +212,11 @@ models:
  - name: patient_id
  tests:
  - not_null
-<<<<<<< HEAD
  - name: source_description
  tests:
  - not_null
  config:
  schema: core_stage
-=======
- - name: source_code
- tests:
- - not_null
- config:
- schema: elation_core
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
  alias: observation
  materialized: table
 
@@ -282,11 +227,7 @@ models:
  - unique
  - not_null
  config:
-<<<<<<< HEAD
  schema: core_stage
-=======
- schema: elation_core
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
  alias: patient
 
  - name: elation_core__practitioner
@@ -296,11 +237,7 @@ models:
  - unique
  - not_null
  config:
-<<<<<<< HEAD
  schema: core_stage
-=======
- schema: elation_core
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
  alias: practitioner
  materialized: table
 
@@ -316,18 +253,10 @@ models:
  - name: patient_id
  tests:
  - not_null
-<<<<<<< HEAD
  - name: source_description
  tests:
  - not_null
  config:
  schema: core_stage
-=======
- - name: source_code
- tests:
- - not_null
- config:
- schema: elation_core
->>>>>>> 54b2bbd9702f9c2541feb47eb7d5b147181d57f0
  alias: procedure
  materialized: table