resolving merge conflict by adding both requirements.
[oweals/karmaworld.git] / karmaworld / apps / notes /
drwxr-xr-x   ..
-rw-r--r-- 0 __init__.py
-rw-r--r-- 559 admin.py
-rw-r--r-- 374 forms.py
-rw-r--r-- 6445 gdrive.py
drwxr-xr-x - management
drwxr-xr-x - migrations
-rw-r--r-- 9764 models.py
-rw-r--r-- 5499 tests.py
-rw-r--r-- 4554 views.py