Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guillaume CLOCHARD
Ragnulf
Commits
fe7d9332
Commit
fe7d9332
authored
May 01, 2016
by
Guillaume CLOCHARD
Browse files
Fix git conflict on algo.py
parent
78b40095
Changes
1
Hide whitespace changes
Inline
Side-by-side
algo.py
View file @
fe7d9332
...
...
@@ -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
))
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment