readme.txt

<<<<<<< HEAD
 this is my first line on updat-readme branch.
this is now second line on update-readme brach.
this is third line on update-readme.
this is the fourth line on update-readme.
On branch update-readme
Your branch is ahead of 'origin/update-readme' by 1 commit.
  (use "git push" to publish your local commits)

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
  (commit or discard the untracked or modified content in submodules)
	modified:   .cache/tracker/meta.db
	modified:   .cache/tracker/meta.db-shm
	modified:   .cache/tracker/meta.db-wal
	deleted:    .local/share/tracker/data/.meta.isrunning
	modified:   .local/share/tracker/data/tracker-store.journal
	modified:   my-first-repo (modified content, untracked content)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	readme.tst

no changes added to commit (use "git add" and/or "git commit -a")
add 5th line on update-readme
add 5ht line
add 6th line.
=======
 I added this line in the update-readme branch.
I am adding a second line in the update-readme branch.
 I am adding a third line to the update-readme branch.
 I am adding a fourth line to update-readme
>>>>>>> master