Skip to content

adamsamec/merging-test

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

18 Commits
 
 
 
 

Repository files navigation

Merging conflicts test - version 1

Here is the first line. The second line follows here, and is modified in version 1. Third line is here. Maybe a fourth line is here. We are getting to the fifth line. Sixth line is exactly here. But in version 2, we have modified it again. And the last line is the seventh one, which we will also modify in version 1. And we are adding an eight line in version 1.

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published