resolved todo conflict (67eef507) · Commits · Izzard, Robert Dr (Maths & Physics) / binary_c-python · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

B

binary_c-python
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

67eef507

Commit 67eef507 authored 5 years ago by David Hendriks

Downloads
- Plain Diff

resolved todo conflict

parents f7f5730d 42abf4ec

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

TODO.org 2 additions, 1 deletion

TODO.org
binarycpython/__init__.py 0 additions, 2 deletions

binarycpython/__init__.py
binarycpython/utils/custom_logging_functions.py 1 addition, 1 deletion

binarycpython/utils/custom_logging_functions.py
binarycpython/utils/functions.py 55 additions, 31 deletions

binarycpython/utils/functions.py
docs/source/conf.py 15 additions, 15 deletions

docs/source/conf.py
examples/examples.py 8 additions, 4 deletions

examples/examples.py
setup.py 10 additions, 11 deletions

setup.py
tests/python_API_test.py 10 additions, 4 deletions

tests/python_API_test.py

with 101 additions and 69 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment