Skip to content

Commit

Permalink
Merge commit 'b67450678710cbc3ad4fcf72d8b53dd695d0a8e8' into beta/3.0.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	android/src/main/java/io/agora/rtc/base/Annotations.java
  • Loading branch information
LichKing-2234 committed Jun 23, 2020
2 parents 7334475 + b674506 commit e8557cd
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions android/src/main/java/io/agora/rtc/base/Annotations.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public class Annotations {
AgoraRtcAppType.APICLOUD,
AgoraRtcAppType.REACTNATIVE,
})
@Retention(RetentionPolicy.SOURCE)
public @interface AgoraRtcAppType {
int NATIVE = 0;
int COCOS = 1;
Expand Down

0 comments on commit e8557cd

Please sign in to comment.