diff options
| author | Sashi20 | 2018-09-17 15:05:23 +0530 |
|---|---|---|
| committer | Sashi20 | 2018-09-17 15:28:57 +0530 |
| commit | 074718390f7ce5cf8692e7bdeff68ea2197926c4 (patch) | |
| tree | 521fbc151989cfefd7875625ab21dbb4d00da789 /nccps2018/__init__.py | |
| parent | 8c6c66af7b4b628a2063261ffd240ee4c715f62f (diff) | |
| download | nccps-2018-074718390f7ce5cf8692e7bdeff68ea2197926c4.tar.gz nccps-2018-074718390f7ce5cf8692e7bdeff68ea2197926c4.tar.bz2 nccps-2018-074718390f7ce5cf8692e7bdeff68ea2197926c4.zip | |
Resolved merge conflict in navbar template regarding namespace
Diffstat (limited to 'nccps2018/__init__.py')
0 files changed, 0 insertions, 0 deletions