Fix scene conflict

Nevazhnovu · Nevazhnovu · commit a830cf742ae5 · 2023-08-18T11:37:09.000+02:00
diff --git a/Assets/ExampleApp/Scenes/SourcepointSampleScene.unity b/Assets/ExampleApp/Scenes/SourcepointSampleScene.unity
@@ -785,11 +785,7 @@ MonoBehaviour:
   propertyId: 16893
   propertyName: mobile.multicampaign.demo
   campaignEnvironment: 1
-<<<<<<< HEAD:Assets/ExampleApp/Scenes/SampleScene.unity
-  messageTimeoutInSeconds: 5
-=======
   messageTimeoutInSeconds: 30
->>>>>>> develop:Assets/ExampleApp/Scenes/SourcepointSampleScene.unity
   authID: 
 --- !u!114 &1221699451
 MonoBehaviour:
