conflict
hw
Merge branch 'master' of
https://github.com/mironovaOlga/python-basics.git

Conflicts:
	practice_1/olga.py
2+2
Merge remote-tracking branch 'original-repo/master'
Assertions start
Merge pull request #18 from mironovaOlga/master

pull request
Assersions: equal, not equal, true, false
Test function and divider string
Assertions: is, is not, none, not none
Signed-off-by: yakovkoshkin <yakov.koshkin@gmail.com>
Assertions: in, not in

Signed-off-by: yakovkoshkin <yakov.koshkin@gmail.com>
Dividers: new file and empty function
Dividers: function and small test
Dividers: Try/except section for Dividers(),
to_bool empty func

Signed-off-by: yakovkoshkin <yakov.koshkin@gmail.com>
Dividers: to_bool created
Merge branch 'practice/assertion'
Merge branch 'practice/dividers'
to_bool
HW duplicates: unique empty function
Assertions: tests in functions
Merge branch 'practice/assertion'