Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
5bae30b6
authored
Jul 30, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: remove conflict marks
parent
3b72505e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
6 deletions
+0
-6
circle/dashboard/views.py
+0
-6
No files found.
circle/dashboard/views.py
View file @
5bae30b6
...
...
@@ -21,11 +21,8 @@ from __future__ import unicode_literals, absolute_import
from
collections
import
OrderedDict
from
itertools
import
chain
from
os
import
getenv
<<<<<<<
HEAD
from
os.path
import
join
,
normpath
,
dirname
,
basename
=======
from
urlparse
import
urljoin
>>>>>>>
master
import
json
import
logging
import
re
...
...
@@ -34,11 +31,8 @@ import requests
from
django.conf
import
settings
from
django.contrib.auth.models
import
User
,
Group
from
django.contrib.auth.views
import
login
,
redirect_to_login
<<<<<<<
HEAD
from
django.contrib.auth.decorators
import
login_required
from
django.contrib.messages
import
warning
=======
>>>>>>>
master
from
django.contrib.messages.views
import
SuccessMessageMixin
from
django.core.exceptions
import
(
PermissionDenied
,
SuspiciousOperation
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment