From 330739fdebed8c3b4ad1f803f5c4c4bde710f95c Mon Sep 17 00:00:00 2001
From: Paul Clark <pdclark@pdclark.com>
Date: Wed, 19 May 2021 07:15:34 -0700
Subject: [PATCH] Version bump.

---
 login-with-google.php | 4 ++--
 readme.txt            | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/login-with-google.php b/login-with-google.php
index 123682a7..807afda1 100644
--- a/login-with-google.php
+++ b/login-with-google.php
@@ -3,7 +3,7 @@
  * Plugin Name: Log in with Google
  * Plugin URI:  https://github.com/rtCamp/login-with-google
  * Description: Allow users to log in with Google on the WordPress login screen.
- * Version:     1.0.11
+ * Version:     1.0.12
  * Author:      rtCamp
  * Author URI:  https://rtcamp.com
  * License:     GPL2
@@ -16,7 +16,7 @@
 define( 'WP_GOOGLE_LOGIN_PATH', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
 define( 'WP_GOOGLE_LOGIN_URL', untrailingslashit( plugin_dir_url( __FILE__ ) ) );
 define( 'WP_GOOGLE_LOGIN_PLUGIN_NAME', plugin_basename( __FILE__ ) );
-define( 'WP_GOOGLE_LOGIN_VERSION', '1.0.10' );
+define( 'WP_GOOGLE_LOGIN_VERSION', '1.0.12' );
 
 $vendor_autoload = sprintf( '%s/vendor/autoload.php', WP_GOOGLE_LOGIN_PATH );
 
diff --git a/readme.txt b/readme.txt
index 4ac9fa22..9e207336 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: Google login, sign in, sso, oauth, authentication, sign-in, single sign-on
 Requires at least: 5.0
 Tested up to: 5.7
 Requires PHP: 7.0
-Stable tag: 1.0.11
+Stable tag: 1.0.12
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
  
@@ -124,6 +124,9 @@ Once you're ready to send a pull request, please run through the following check
  
 == Changelog ==
 
+= 1.0.12 =
+* Fix conflict with Login with GitHub plugin.
+
 = 1.0.11 =
 * Add 'login_with_google/client_arguments' filter for Google_Client arguments.