[ci] merge fail · f18ec309a0 - eden - InfoTonic - Git

[ci] merge fail

Signed-off-by: crueter <crueter@eden-emu.dev>

pull/37/head

crueter 8 months ago

parent

d060132523

commit

f18ec309a0

No known key found for this signature in database GPG Key ID: 425ACD2D4830EBC6

1 changed files with 1 additions and 0 deletions

Unified View

								
									1

.ci/linux/build.sh

									View File
								
				@ -71,6 +71,7 @@ if [ "$USE_MULTIMEDIA" = "false" ]; then
			
				    MULTIMEDIA=OFF
				
				    MULTIMEDIA=OFF
			
				else
				
				else
			
				    MULTIMEDIA=ON
				
				    MULTIMEDIA=ON
			
				fi
			
				if [ -z "$BUILD_TYPE" ]; then
				
				if [ -z "$BUILD_TYPE" ]; then
			
				    export BUILD_TYPE="Release"
				
				    export BUILD_TYPE="Release"