Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
88886eaf
Commit
88886eaf
authored
Oct 09, 2017
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve text_env.rb conflict
parent
c729b06a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
spec/support/test_env.rb
spec/support/test_env.rb
+0
-4
No files found.
spec/support/test_env.rb
View file @
88886eaf
...
...
@@ -46,13 +46,9 @@ module TestEnv
'v1.1.0'
=>
'b83d6e3'
,
'add-ipython-files'
=>
'93ee732'
,
'add-pdf-file'
=>
'e774ebd'
,
<<<<<<<
HEAD
'squash-large-files'
=>
'54cec52'
,
'add-pdf-text-binary'
=>
'79faa7b'
=======
'add-pdf-text-binary'
=>
'79faa7b'
,
'add_images_and_changes'
=>
'010d106'
>>>>>>>
ce
-
com
/
master
}.
freeze
# gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
...
...
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