resolve merge conflict

phelps-sg · Nov 9, 2023 · 3bc3b42 · 3bc3b42
1 parent a33b606
commit 3bc3b42
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/llm_cooperation/gametypes/repeated.py b/llm_cooperation/gametypes/repeated.py
@@ -228,7 +228,7 @@ def generate_samples(
                 game_setup.payoffs,
                 game_setup.extract_choice,
                 measurement_setup.compute_freq,
-                game_setup.rounds,
+                game_setup.analyse_rounds,
             )
         except ValueError as ex:
             logger.exception(ex)