Closed jenslauterbach closed 11 years ago
Finally. Here it is. The first version of my Manufacturing Tool. I tried hard to make merging it as easy as possible.
But urls.py will have to be merge manually. The important thing is, that I only added the following to the urls.py:
urlpatterns += patterns('', url(r'^manufacturing/', include('apps.manufacturing.urls')), )
The rest of the conflicts in urls.py comes from different formatting options I use (zweizeichen and I already started a discussion on that).
Finally. Here it is. The first version of my Manufacturing Tool. I tried hard to make merging it as easy as possible.
But urls.py will have to be merge manually. The important thing is, that I only added the following to the urls.py:
The rest of the conflicts in urls.py comes from different formatting options I use (zweizeichen and I already started a discussion on that).