Commit fe7d9332 authored by Guillaume CLOCHARD's avatar Guillaume CLOCHARD
Browse files

Fix git conflict on algo.py

parent 78b40095
......@@ -1583,14 +1583,6 @@ if __name__ == '__main__':
print('☞ FTL :', round(moyenne(listeMoyenne[1]), 2))
print('☞ OLL :', round(moyenne(listeMoyenne[2]), 2))
print('☞ PLL :', round(moyenne(listeMoyenne[3]), 2))
<<<<<<< HEAD
print(
'☞ ' + TermColors.bold + 'Total :',
round(moyenne(listeMoyenne[4]), 2),
TermColors.end + '\n'
)
=======
>>>>>>> stats_courbe
print('\n' + TermColors.bold + 'Ecarts types :' + TermColors.end)
print('☞ Croix :', round(ecart_type(listeMoyenne[0]), 2))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment