conflict fix

n-claes · Feb 14, 2022 · c4da9b7 · c4da9b7
1 parent a5bca9d
commit c4da9b7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/matrices/smod_viscosity_matrix.f08 b/src/matrices/smod_viscosity_matrix.f08
@@ -1,5 +1,5 @@
 submodule (mod_matrix_manager) smod_viscosity_matrix
-  use mod_global_variables, only: viscosity_value, viscous_heating, gamma_1, incompressible
+  use mod_global_variables, only: viscosity_value, viscous_heating, incompressible
   use mod_equilibrium, only: v_field
   implicit none