first commit
first commit after yo angular
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# Explicit paths specified without -i nor -o; assuming --only paths...
#
# Committer: philippe le roux <ylm68@air-de-pleroux.bouyguesbox.fr>
#
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes to be committed:
#	modified:   README
#
first commit after yo angular
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# Explicit paths specified without -i nor -o; assuming --only paths...
#
# Committer: philippe le roux <ylm68@air-de-pleroux.bouyguesbox.fr>
#
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes to be committed:
#	modified:   README
#
Merge remote-tracking branch 'origin/master'

Conflicts:
	README