Resolve merge conflicts

dbt-labs · Apr 9, 2024 · d43be99 · d43be99
2 parents f33fe3f + cef41c2
commit d43be99
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,11 +1,9 @@
 name: dbt Cloud CI
-
 on:
   pull_request:
     branches:
       - main
       - staging
-
 jobs:
   run_snowflake:
     name: dbt Cloud PR CI Snowflake

diff --git a/models/marts/orders.sql b/models/marts/orders.sql
@@ -32,6 +32,7 @@ order_items_summary as (
                 else 0
             end
         ) as count_drink_items
+
     from order_items
 
     group by 1

diff --git a/requirements.txt b/requirements.txt
@@ -10,9 +10,9 @@ click==8.1.7
     # via typer
 distlib==0.3.8
     # via virtualenv
-faker==24.7.1
+faker==24.8.0
     # via jafgen
-filelock==3.13.3
+filelock==3.13.4
     # via virtualenv
 identify==2.5.35
     # via pre-commit
@@ -53,7 +53,7 @@ shellingham==1.5.4
     # via typer
 six==1.16.0
     # via python-dateutil
-typer==0.12.2
+typer==0.12.3
     # via jafgen
 typing-extensions==4.11.0
     # via typer
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,7 @@ order_items_summary as ( @@
                     else 0
                 end
             ) as count_drink_items
         from order_items
         group by 1
@@ Expand Down @@