rebase

coderxio · May 17, 2024 · ca79a75 · ca79a75
1 parent 0480383
commit ca79a75
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/...agerx/models/intermediate/rxnorm/int_rxnorm_clinical_products_to_ingredient_strengths.sql b/...agerx/models/intermediate/rxnorm/int_rxnorm_clinical_products_to_ingredient_strengths.sql
@@ -48,11 +48,6 @@ risl as (
 
     select * from {{ ref('stg_rxnorm__ingredient_strength_links') }}
 
-<<<<<<< HEAD
-, ris as (
-    select * from {{ ref('stg_rxnorm__ingredient_strengths') }}
-)
-=======
 ),
 
 ris as (
@@ -62,7 +57,6 @@ ris as (
 ),
 
 pinl as (
->>>>>>> parent of 56f786e (rxnorm update and intermediate tables)
 
     select * from {{ ref('stg_rxnorm__precise_ingredient_links') }}