Skip to content

Commit

Permalink
Merge remote-tracking branch 'main/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/example/myapplication/MainActivity.java
  • Loading branch information
abhishektyagi2912 committed Dec 26, 2023
2 parents 4002174 + 56cab9a commit 5795d6f
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app/src/main/java/com/example/myapplication/PersonalChat.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
import android.view.View;
import android.view.ViewGroup;

import com.zegocloud.uikit.prebuilt.call.config.ZegoNotificationConfig;
import com.zegocloud.uikit.prebuilt.call.invite.ZegoUIKitPrebuiltCallInvitationConfig;
import com.zegocloud.uikit.prebuilt.call.invite.ZegoUIKitPrebuiltCallInvitationService;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
Expand Down

0 comments on commit 5795d6f

Please sign in to comment.