Remove <<<< HEAD refences.

WordPress · Jan 2, 2018 · 7fea488 · 7fea488
1 parent 8c1f4e1
commit 7fea488
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/blocks/library/gallery/index.js b/blocks/library/gallery/index.js
@@ -32,7 +32,6 @@ registerBlockType( 'core/gallery', {
 		images: {
 			type: 'array',
 			default: [],
-<<<<<<< HEAD
 			source: 'query',
 			selector: 'ul.wp-block-gallery .blocks-gallery-item img',
 			query: {
@@ -49,13 +48,6 @@ registerBlockType( 'core/gallery', {
 					attribute: 'data-id',
 				},
 			},
-=======
-			source: query( 'ul.wp-block-gallery .blocks-gallery-item img', {
-				url: attr( 'src' ),
-				alt: attr( 'alt' ),
-				id: attr( 'data-id' ),
-			} ),
->>>>>>> Change class to blocks-gallery-item.
 		},
 		columns: {
 			type: 'number',