ngTagsInput/1q at master · nealclark/ngTagsInput · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
Merge branch 'master' of github.com:nealclark/ngTagsInput

* 'master' of github.com:nealclark/ngTagsInput:
  chore(release): Release v2.2.0
  chore(release): Release v2.2.0
  chore(release): Release v2.2.0
  Include padding in width calculation

Conflicts:
	CHANGELOG.md
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 5 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   CHANGELOG.md
#	modified:   src/autosize.js
#	modified:   test/autosize.spec.js
#