Resolve merge conflicts

RocketChat · Apr 20, 2018 · 697392a · 697392a
2 parents 99c2e3e + d542860
commit 697392a
Show file tree

Hide file tree

Showing 10 changed files with 1,642 additions and 9,838 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: node_js
-node_js: 7
+node_js: 8
 cache:
   yarn: true
   directories:

diff --git a/Mac_Production.provisionprofile → Production.provisionprofile b/Mac_Production.provisionprofile → Production.provisionprofile
diff --git a/build/entitlements.mac.inherit.plist → build/entitlements.mas.inherit.plist b/build/entitlements.mac.inherit.plist → build/entitlements.mas.inherit.plist
diff --git a/build/entitlements.mac.plist → build/entitlements.mas.plist b/build/entitlements.mac.plist → build/entitlements.mas.plist