Another merge - #4

Open

insouciiance wants to merge 7 commits into

ProgramEngineeringKPI:masterfrom

insouciiance:another-merge

Commits on Feb 8, 2020

Change for to Sum() in sum calculator
gisachenko
committed
2cec7ca
Add some strange file reader that returns the length of file
gisachenko
committed
b365300
Add waiting for user input after program has run
gisachenko
committed
594f542

Commits on Feb 9, 2021

Merge branch 'no-merge-conflict-branch' into master
insouciiance
committed
8489a24
Merge branch 'merge-conflict-auto-resolve' into master
insouciiance
committed
0bed12c
Merge branch 'merge-conflict-branch' into master.
insouciiance
committed
fb9f6b1

Commits on Feb 10, 2021

Add some strange file reader that returns the length of file

gisachenko
authored and
insouciiance
committed
e271e60