Moving things around.

.gitignore

@@ -1,4 +1,4 @@
 *.pyc
 db/*.sqlite3
 .DS_Store
-apps/*
+chiplog/*

public/static/base_admin

@@ -1 +1 @@
-/usr/local/django/trunk/django/contrib/admin/media/
+/Users/trey/Sources/django/core/trunk/django/contrib/admin/media/

public/static/chiplog

@@ -1 +1 @@
-/Library/Python/2.5/site-packages/chiplog/static/
+/Users/trey/DjangoProjects/chiplog_proj/chiplog/static/

settings.py

@@ -35,7 +35,7 @@
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = '/Users/trey/Sites/dev/Django/chiplog_proj/public/static/'
+MEDIA_ROOT = '/Users/trey/DjangoProjects/chiplog_proj/public/static/'
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
@@ -71,7 +71,7 @@
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    '/Users/trey/Sites/dev/Django/chiplog_proj/templates',
+    # '/Users/trey/Sites/dev/Django/chiplog_proj/templates',
 )
 
 INSTALLED_APPS = (