Update 2.txt
Merge remote-tracking branch 'origin' into dev
a
Merge remote-tracking branch 'origin/dev' into dev