Merge branch 'dev_staging' of https://bitbucket.org/credit_fair/bureau-service into dev_staging # Conflicts: # crud/crud_bureau.py # # It looks like you may be committing a merge. # If this is not correct, please run # git update-ref -d MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # # Committer: root # # On branch dev_staging # Your branch and 'origin/dev_staging' have diverged, # and have 8 and 22 different commits each, respectively. # (use "git pull" to merge the remote branch into yours) # # All conflicts fixed but you are still merging. # # Changes to be committed: # modified: clients/bureau.py # modified: clients/pan_card.py # modified: config.py # modified: crud/crud_bureau.py # modified: index.py # # Untracked files: # __pycache__/uploadreportstos3.cpython-37.pyc # creditfair.sh # env-list #