resolved conflict

LICENSE

@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2021, Daily
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

dailyjs/basic-call/components/Intro/Intro.js

@@ -47,9 +47,11 @@ export const Intro = ({ room, error, domain, onJoin, fetching = false }) => {
         <Field label="Fetch meeting token">
           <BooleanInput onChange={(e) => setFetchToken(e.target.checked)} />
         </Field>
-        <Field label="Join as owner">
-          <BooleanInput onChange={(e) => setOwner(e.target.checked)} />
-        </Field>
+        {fetchToken && (
+          <Field label="Join as owner">
+            <BooleanInput onChange={(e) => setOwner(e.target.checked)} />
+          </Field>
+        )}
       </CardBody>
       <CardFooter divider>
         <Button

dailyjs/basic-call/components/Room/Room.js

@@ -7,8 +7,11 @@ import { useCallState } from '@dailyjs/shared/contexts/CallProvider';
 import { useMediaDevices } from '@dailyjs/shared/contexts/MediaDeviceProvider';
 import { useParticipants } from '@dailyjs/shared/contexts/ParticipantsProvider';
 import { useUIState } from '@dailyjs/shared/contexts/UIStateProvider';
+<<<<<<< HEAD
 import { useWaitingRoom } from '@dailyjs/shared/contexts/WaitingRoomProvider';
 
+=======
+>>>>>>> e47ada8fa4389bbfbeb7c97a6d80731a33d24b01
 import { ReactComponent as IconCameraOff } from '@dailyjs/shared/icons/camera-off-md.svg';
 import { ReactComponent as IconCameraOn } from '@dailyjs/shared/icons/camera-on-md.svg';
 import { ReactComponent as IconLeave } from '@dailyjs/shared/icons/leave-md.svg';
@@ -24,7 +27,6 @@ import { Tray, TrayButton } from './Tray';
 
 export const Room = ({ onLeave }) => {
   const { callObject } = useCallState();
-  const { localParticipant } = useParticipants();
   const { setShowDeviceModal } = useUIState();
   const { isCamMuted, isMicMuted } = useMediaDevices();
   const { setShowModal, showModal } = useWaitingRoom();

dailyjs/basic-call/env.example

@@ -1,8 +1,8 @@
 # Domain excluding 'https://' and 'daily.co' e.g. 'somedomain'
 DAILY_DOMAIN=
 
-# Obtained from https://dashboard.staging.daily.co/developers
+# Obtained from https://dashboard.daily.co/developers
 DAILY_API_KEY=
 
 # Daily REST API endpoint
-DAILY_REST_DOMAIN=https://api.daily.co/v1
+DAILY_REST_DOMAIN=https://api.daily.co/v1