Commit 15c2f000 authored by Kyle B. Johnson's avatar Kyle B. Johnson

fix merge conflicts.

parent 9299214c
......@@ -55,11 +55,7 @@ if( get_option( 'ninja_forms_load_deprecated', FALSE ) && ! ( isset( $_POST[ 'nf
/**
* @since 3.0
*/
<<<<<<< HEAD
const VERSION = '3.0.15';
=======
const VERSION = '3.0.16';
>>>>>>> develop
/**
* @var Ninja_Forms
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment