Merge pull request #27 from amrael/django18

[django-pagination.git] / linaro_django_pagination / test_project / example / urls.py

diff --git a/linaro_django_pagination/test_project/example/urls.py b/linaro_django_pagination/test_project/example/urls.py
index 015da39..f3fc5ae 100644 (file)
--- a/linaro_django_pagination/test_project/example/urls.py
+++ b/linaro_django_pagination/test_project/example/urls.py
@@ -1,10 +1,10 @@
 # Copyright (c) 2010, 2011 Linaro Limited
 # All rights reserved.
 # Copyright (c) 2010, 2011 Linaro Limited
 # All rights reserved.

-# 
+#

 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:

-# 
+#

 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above


@@ -14,7 +14,7 @@
 #     * Neither the name of the author nor the names of other
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
 #     * Neither the name of the author nor the names of other
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.

-# 
+#

 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR


@@ -34,5 +34,4 @@ from django.conf.urls.defaults import (
 urlpatterns = patterns(
     'example.views',
     url(r'^list/$', 'list'),
 urlpatterns = patterns(
     'example.views',
     url(r'^list/$', 'list'),

-    url(r'^complex-list/$', 'complex_list'),
-)
+    url(r'^complex-list/$', 'complex_list'))