Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Lstu
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
6
Issues
6
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Fiat Tux
Hat softwares
Lstu
master
master
Switch branch/tag
lstu
.gitattributes
Find file
Normal view
History
Permalink
.gitattributes
22 Bytes
Edit
Web IDE
Newer
Older
Trying to create a merge conflict on zanata.xml
c81a2465
Luc Didry
committed
Mar 22, 2018
1
zanata.xml merge=ours
