Commit graph

1099 commits

Author SHA1 Message Date
jeet041
c2a6520756
Update UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 01:07:24 +05:30
jeet041
8853318834
Update UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 01:07:09 +05:30
jeet041
809c26334f
Update UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 00:47:49 +05:30
jeet041
4463e5fa34
Update UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 00:46:17 +05:30
jeet041
a3b9c39b86
Create UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 00:45:34 +05:30
jeet041
297c5f474d
Create UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 00:45:06 +05:30
Jitendra-Mahor_brillio
76ff9273ca Auto-merged using Claude 2025-04-23 16:01:04 +05:30
jeet041
1960d2e570
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-23 16:00:27 +05:30
jeet041
c9481d6edf
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-23 15:59:57 +05:30
Jitendra-Mahor_brillio
bb524d57aa Auto-merged using Claude 2025-04-23 15:55:36 +05:30
jeet041
39cf6f101d
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-23 15:54:25 +05:30
jeet041
4dc3cf6c89
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-23 15:54:11 +05:30
Jitendra-Mahor_brillio
17bd8659fe Auto-merged using Claude 2025-04-23 15:51:36 +05:30
AI Resolver
d0f92e6bec 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-23 10:55:10 +05:30
jeet041
a22253921a
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-23 10:53:24 +05:30
jeet041
ea9a74be2f
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-23 10:52:38 +05:30
AI Resolver
28a1973b5f 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-23 10:51:26 +05:30
AI Resolver
33835fe8f7 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-23 10:28:41 +05:30
AI Resolver
782b473332 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-23 10:26:12 +05:30
AI Resolver
a848644aa3 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 20:53:16 +05:30
jeet041
9260c299fe
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 20:18:29 +05:30
jeet041
1be0fef832
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 20:18:02 +05:30
jeet041
9452907edd
Merge branch 'main' into dev-conflict
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 17:52:15 +05:30
Jitendra-Mahor_brillio
6fd91c27ca 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 17:46:35 +05:30
Jitendra-Mahor_brillio
266765cc45 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 17:41:58 +05:30
Jitendra-Mahor_brillio
899707ab94 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 17:39:24 +05:30
Jitendra-Mahor_brillio
4cf2872be6 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 17:37:19 +05:30
Jitendra-Mahor_brillio
03bcf69bec 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 17:36:01 +05:30
jeet041
ccd89e0954
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 17:35:16 +05:30
jeet041
507ab58eeb
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 17:34:57 +05:30
jeet041
5ace86498e
Merge branch 'main' into dev-conflict
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 17:34:19 +05:30
Jitendra-Mahor_brillio
e450d67c9d 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 17:30:19 +05:30
Jitendra-Mahor_brillio
dfa8d3c86b 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 17:27:42 +05:30
Jitendra-Mahor_brillio
6ebd2f687f 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 17:26:03 +05:30
Jitendra-Mahor_brillio
c269c3feda 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 17:24:39 +05:30
Jitendra-Mahor_brillio
dae1070aba 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 17:22:45 +05:30
jeet041
99df760eac
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 17:19:48 +05:30
jeet041
e92c3ad6d3
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 17:19:05 +05:30
Jitendra-Mahor_brillio
15206e0efe 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 17:13:38 +05:30
jeet041
1af0a66d16
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 17:12:21 +05:30
jeet041
576f73451d
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 17:11:53 +05:30
Jitendra-Mahor_brillio
1aed130c70 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 16:46:47 +05:30
Jitendra-Mahor_brillio
31eb3ad691 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 16:43:19 +05:30
jeet041
2b70de3ff2
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 16:42:41 +05:30
jeet041
acda0f467a
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 16:42:28 +05:30
Jitendra-Mahor_brillio
e91dadeb2f 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 16:40:19 +05:30
jeet041
c8953daddf
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 16:10:12 +05:30
jeet041
a30d8a1bd4
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 16:09:25 +05:30
Jitendra-Mahor_brillio
a5d677ad49 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-22 15:20:50 +05:30
jeet041
8863c61fe2
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-22 15:19:20 +05:30