Commit graph

1073 commits

Author SHA1 Message Date
jeet041
28b0a00167
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-28 16:50:08 +05:30
Jitendra-Mahor_brillio
8a98c814aa 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-24 14:14:38 +05:30
jeet041
ee4252d3c8
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 14:10:45 +05:30
jeet041
9c7a5075cf
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 14:10:21 +05:30
jeet041
6f6603e2f3
🔀 Merged via GitHub API
Update test_conflict.java
2025-04-24 14:01:57 +05:30
Jitendra-Mahor_brillio
98901ee25b 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-24 14:01:51 +05:30
jeet041
bb4becce4c
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 13:49:57 +05:30
jeet041
65ebc84e48
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 13:49:02 +05:30
jeet041
e7947bbc0a
🔀 Merged via GitHub API
Update test_conflict.java
2025-04-24 12:25:26 +05:30
Jitendra-Mahor_brillio
63de9a10f2 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-24 12:25:20 +05:30
jeet041
28c66c2b7e
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 12:24:15 +05:30
jeet041
bbf41d640b
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 12:23:46 +05:30
Jitendra-Mahor_brillio
5c3f8b8c89 🤖 Auto-resolved merge conflicts with Claude AI 2025-04-24 12:11:03 +05:30
jeet041
7617d8ab37
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 11:52:09 +05:30
jeet041
30ddbb6009
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 11:51:53 +05:30
jeet041
561b191fb1
🔀 Merged via GitHub API
Dev conflict
2025-04-24 01:33:48 +05:30
Jitendra-Mahor_brillio
d5b73b42fa Auto-merged using Claude 2025-04-24 01:29:07 +05:30
jeet041
e63769936d
Update UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 01:17:58 +05:30
jeet041
7c693ec2df
Update UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 01:13:05 +05:30
jeet041
1e7674896c
Update UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 01:12:25 +05:30
jeet041
201baee320
Update UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 01:11:54 +05:30
jeet041
962375a7fe
Update UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 01:11:38 +05:30
jeet041
5a82ae3a41
Update UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 01:08:36 +05:30
jeet041
9a3e4c308a
Update UserService.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
2025-04-24 01:08:14 +05:30
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