1.txt added
Text added to README.md
README edited
Conflicting merge resolved
Merge branch 'feature/testFeature1' into develop
Fix1
Merge branch 'release/1.0'