Merge pull request #192 from dkingman/patch-1

Removed commit marker
omab · Feb 18, 2014 · b832290 · b832290
2 parents 4fe9dd5 + f510c3f
commit b832290
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/examples/django_example/example/templates/home.html b/examples/django_example/example/templates/home.html
@@ -67,7 +67,6 @@
 <a href="{% url 'social:begin' 'yandex-oauth2' %}">Yandex OAuth2</a>
 <a href="{% url 'social:begin' 'taobao' %}">TAOBAO OAuth2</a> <br />
 <a href="{% url 'social:begin' 'vimeo' %}">Vimeo OAuth1</a> <br />
->>>>>>> 3aec8a973b809746ffdee33de39f55e64b293e9a
 
 <a href="{% url 'social:begin' 'email' %}">Email Auth</a> <br />
 <a href="{% url 'social:begin' 'username' %}">Username Auth</a> <br />