From aa617272b8f8c3fac3f537487d323345c281d742 Mon Sep 17 00:00:00 2001 From: Ivan Date: Fri, 13 Apr 2018 03:11:57 +0200 Subject: [PATCH] Cinematica --- Assets/Video/IntroENG.mp4.meta | 4 ---- Assets/Video/IntroSPA.mp4.meta | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Assets/Video/IntroENG.mp4.meta b/Assets/Video/IntroENG.mp4.meta index 2453324..310a531 100644 --- a/Assets/Video/IntroENG.mp4.meta +++ b/Assets/Video/IntroENG.mp4.meta @@ -4,11 +4,7 @@ VideoClipImporter: externalObjects: {} serializedVersion: 2 useLegacyImporter: 1 -<<<<<<< HEAD - quality: 0.06 -======= quality: 0.5 ->>>>>>> 1561cd131072ba119551c014dda2539db9fc28f5 isColorLinear: 0 frameRange: 0 startFrame: -1 diff --git a/Assets/Video/IntroSPA.mp4.meta b/Assets/Video/IntroSPA.mp4.meta index 231074f..740fd36 100644 --- a/Assets/Video/IntroSPA.mp4.meta +++ b/Assets/Video/IntroSPA.mp4.meta @@ -4,11 +4,7 @@ VideoClipImporter: externalObjects: {} serializedVersion: 2 useLegacyImporter: 1 -<<<<<<< HEAD - quality: 0.06 -======= quality: 0.5 ->>>>>>> 1561cd131072ba119551c014dda2539db9fc28f5 isColorLinear: 0 frameRange: 0 startFrame: -1