[Bf-blender-cvs] [6b33e71843a] greasepencil-object: Fix merge error

[Antonio Vazquez]

Commit: 6b33e71843a924bb1df212be5f9d9c47045d8189
Author: Antonio Vazquez
Date:   Mon Apr 23 10:09:13 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6b33e71843a924bb1df212be5f9d9c47045d8189

Fix merge error

===================================================================

M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/blenloader/intern/versioning_280.c

===================================================================

diff --git a/release/scripts/addons b/release/scripts/addons
index 8d3301f66c7..371960484a3 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 8d3301f66c77e7b5a1f310a311d2055dbd473e09
+Subproject commit 371960484a38fc64e0a2635170a41a0d8ab2f6bd
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 8cd4e766fa8..a8515cfdfe9 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 8cd4e766fa881f98ad1261bcc3506524460261b8
+Subproject commit a8515cfdfe9a98127b592f36fcbe51b7e23b969a
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index f4cdf5f423d..487bd9a9273 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -690,7 +690,6 @@ void do_versions_after_linking_280(Main *main)
 			}
 		}
 	}
-}
 
 	/* Grease Pencil Object */
 	/* Convert grease pencil datablock to GP object */