Merge branch 'main' of https://git.xiongxiao.me/abearxiong/test-convex
This commit is contained in:
12
convex/_generated/api.d.ts
vendored
12
convex/_generated/api.d.ts
vendored
@@ -9,7 +9,13 @@
|
||||
*/
|
||||
|
||||
import type * as abcv from "../abcv.js";
|
||||
<<<<<<< HEAD
|
||||
import type * as xiong from "../xiong.js";
|
||||
=======
|
||||
import type * as actions_jwt from "../actions/jwt.js";
|
||||
import type * as actions_redis from "../actions/redis.js";
|
||||
import type * as http from "../http.js";
|
||||
>>>>>>> 5657bffd39687b05f44247a0318fee65990aa3db
|
||||
|
||||
import type {
|
||||
ApiFromModules,
|
||||
@@ -19,7 +25,13 @@ import type {
|
||||
|
||||
declare const fullApi: ApiFromModules<{
|
||||
abcv: typeof abcv;
|
||||
<<<<<<< HEAD
|
||||
xiong: typeof xiong;
|
||||
=======
|
||||
"actions/jwt": typeof actions_jwt;
|
||||
"actions/redis": typeof actions_redis;
|
||||
http: typeof http;
|
||||
>>>>>>> 5657bffd39687b05f44247a0318fee65990aa3db
|
||||
}>;
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user