fix: conflicts

Browse Source

...

This commit is contained in:

Jannat Patel

2021-10-24 12:03:06 +05:30

parent f5af07086b

commit 050cfa494c

23 changed files with 478 additions and 154 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

school/lms/web_template/courses_enrolled/__init__.py