Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb  | 
			||
|---|---|---|
| .. | ||
| panel/gallery | ||
| .gitkeep | ||
				
					
						Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb  | 
			||
|---|---|---|
| .. | ||
| panel/gallery | ||
| .gitkeep | ||