Fix missing save conflict

2025-12-13 16:08:11 +00:00 · 2018-01-23 11:32:40 +01:00 · 2018-01-23 11:32:40 +01:00 · 9ddd7f12a8
commit 9ddd7f12a8
parent a6e78f023b
14 changed files with 14 additions and 18 deletions
--- a/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js
+++ b/packages/strapi-plugin-users-permissions/config/functions/bootstrap.js
@ -57,12 +57,8 @@ module.exports = cb => {
            'user:email'
          ]
        },
-<<<<<<< HEAD
-        linkedin2: {
-          enabled: false,
-=======
        twitter: {
->>>>>>> eb1d1645fd14de170fb55d6ca4c570eb9c82733c
+          enabled: false,
          key: '',
          secret: '',
          callback: '/auth/twitter/callback'
--- a/packages/strapi-plugin-users-permissions/package.json
+++ b/packages/strapi-plugin-users-permissions/package.json
@ -1,6 +1,6 @@
 {
  "name": "strapi-plugin-users-permissions",
-  "version": "3.0.0-alpha.8",
+  "version": "3.0.0-alpha.8.3",
  "description": "Protect your API with a full-authentication process based on JWT",
  "strapi": {
    "name": "Auth & Permissions",