Commit c9679e0d authored by Kyle B. Johnson's avatar Kyle B. Johnson

fix merge conflicts.

parent 15c2f000
...@@ -3,11 +3,7 @@ ...@@ -3,11 +3,7 @@
Plugin Name: Ninja Forms Plugin Name: Ninja Forms
Plugin URI: http://ninjaforms.com/ Plugin URI: http://ninjaforms.com/
Description: Ninja Forms is a webform builder with unparalleled ease of use and features. Description: Ninja Forms is a webform builder with unparalleled ease of use and features.
<<<<<<< HEAD
Version: 3.0.15
=======
Version: 3.0.16 Version: 3.0.16
>>>>>>> develop
Author: The WP Ninjas Author: The WP Ninjas
Author URI: http://ninjaforms.com Author URI: http://ninjaforms.com
Text Domain: ninja-forms Text Domain: 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