| commit | da609ae94db37b1655174ddeac5950708639c099 | [log] [tgz] |
|---|---|---|
| author | Tony Mack <tony.mack@gmail.com> | Wed Aug 26 15:30:11 2015 +0000 |
| committer | Tony Mack <tony.mack@gmail.com> | Wed Aug 26 15:30:11 2015 +0000 |
| tree | c0f5a512dac00dbb4d8220d455142a74425789a0 | |
| parent | b2cfdb942b54a0d6fc531110144ad1c28aea099a [diff] |
syntax error
diff --git a/xos/core/admin.py b/xos/core/admin.py index aa6f7f8..f668ae0 100644 --- a/xos/core/admin.py +++ b/xos/core/admin.py
@@ -402,7 +402,6 @@ def queryset(self, request): return Tag.select_by_user(request.user) -<<<<<<< HEAD class NetworkLookerUpper: """ This is a callable that looks up a network name in a instance and returns the ip address for that network.