resolve merge conflict

data_diff/diff_tables.py

@@ -135,11 +135,11 @@ def _get_stats(self, is_dbt: bool = False) -> DiffStats:
 
  return DiffStats(diff_by_sign, table1_count, table2_count, unchanged, diff_percent, extra_column_diffs)
 
- def get_stats_string(self, is_dbt: bool = False):
 
+ def get_stats_string(self, is_dbt: bool = False):
  diff_stats = self._get_stats(is_dbt)
- if is_dbt:
 
+ if is_dbt:
  string_output = "\n| Rows Added\t| Rows Removed\n"
  string_output += "------------------------------------------------------------\n"