Local commit
mergingMerge branch 'master' of https://github.com/readandpasson/rapoproject
Merge branch 'master' of https://github.com/readandpasson/rapoproject
Merge branch 'master' of https://github.com/readandpasson/rapoproject
Merge branch 'master' of https://github.com/readandpasson/rapoproject
Merge branch 'master' of https://github.com/readandpasson/rapoproject
Merge branch 'master' of https://github.com/readandpasson/rapoproject
Merge branch 'master' of https://github.com/readandpasson/rapoproject
Merge branch 'master' of https://github.com/readandpasson/rapoproject
Test
local changes for settings.py
Merging remote changes
Merge branch 'master' of https://github.com/readandpasson/rapoproject
Merge branch 'master' of https://github.com/readandpasson/rapoproject
changes with db change
changes with db change
changes with db change
changes with db change
trying to resolve conflicts
merged with reviews