Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
countries
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Steve Wanzong
countries
Commits
25b44a32
Commit
25b44a32
authored
5 years ago
by
Tim Olander
Browse files
Options
Downloads
Plain Diff
Resolved conflict in README file with two contries
parents
6e10e34e
d8ea21f5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
README.md
+1
-0
1 addition, 0 deletions
README.md
with
1 addition
and
0 deletions
README.md
+
1
−
0
View file @
25b44a32
# countries
Iceland
United States
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
