Changeset 10888

Show
Ignore:
Timestamp:
09/26/11 14:11:03 (20 months ago)
Author:
Snyder.Jason
Message:

removed some diff commments accident left in file

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • ossiedev/trunk/tools/cornetApps/settings.py

    r10880 r10888  
    1414        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. 
    1515        #'NAME': 'cornetApps.db',                      # Or path to database file if using sqlite3. 
    16         'NAME': '/home/webdemo/cornetApps/cornetApps.db', 
     16            'NAME': '/home/webdemo/cornetApps/cornetApps.db', 
    1717        'USER': '',                      # Not used with sqlite3. 
    1818        'PASSWORD': '',                  # Not used with sqlite3. 
    … …  
    5454MEDIA_URL = '' 
    5555 
    56 <<<<<<< .mine 
     56 
    5757# Base URL for website to reference anchors 
    5858URL_ROOT = 'http://cornet.wireless.vt.edu/~webdemo/django/' 
    5959 
    60 ======= 
    61 # Base URL for website 
    62 URL_ROOT = 'http://cornet.wireless.vt.edu/~webdemo/django/' 
    63  
    64 >>>>>>> .r10877 
    6560# Absolute path to the directory static files should be collected to. 
    6661# Don't put anything in this directory yourself; store your static files