resolve conflicts

rudderlabs · Feb 17, 2020 · bf2a9a4 · bf2a9a4
1 parent eb8c0e8
commit bf2a9a4
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 26 deletions.
diff --git a/rudder-client-javascript/analytics/dist/rudder.min.js b/rudder-client-javascript/analytics/dist/rudder.min.js
diff --git a/...javascript/analytics/tests/html/test.html → tests/html/autotrack-test.html b/...javascript/analytics/tests/html/test.html → tests/html/autotrack-test.html
diff --git a/...t-javascript/analytics/utils/autotrack.js → utils/autotrack.js b/...t-javascript/analytics/utils/autotrack.js → utils/autotrack.js