resolved conflicts

chaloBEST/mumbai/models.py

@@ -49,7 +49,7 @@ class Area(models.Model):
 class Road(models.Model):
     roadcd = models.IntegerField(primary_key=True)
     roadnm = models.TextField(blank=True, max_length=255)
-    roadnm_mr= models.TextField(blank=True, max_length=512)
+    #roadnm_mr= models.TextField(blank=True, max_length=512)
     def __unicode__(self):
         return self.roadnm   
 

chaloBEST/urls.py

@@ -9,6 +9,7 @@ urlpatterns = patterns('',
     # Example:
     # (r'^chaloBEST/', include('chaloBEST.foo.urls')),
     url(r'^$','chaloBEST.views.index', name='index'),
+    url(r'^static/(?P<path>.*)$','django.views.static.serve', {'document_root':'./static'}),
     
     # Uncomment the admin/doc line below to enable admin documentation:
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),