Fixed conflicts

angulartics · Sep 19, 2016 · cdaed2b · cdaed2b
2 parents 59bb20b + a36e75d
commit cdaed2b
Show file tree

Hide file tree

Showing 3 changed files with 357 additions and 241 deletions.
diff --git a/dist/angulartics-ga.min.js b/dist/angulartics-ga.min.js