Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

resolve merge conflicts

Vasek Mlejnsky0591478cb650
diff --cc components/AgentLogFilesList.tsx
index 4c169d004,6dfa6da2d..a06566bc3
--- a/components/AgentLogFilesList.tsx
+++ b/components/AgentLogFilesList.tsx
@@@ -112,7 -112,7 +112,11 @@@ function AgentLogFilesList(
onClick={handleClick}
>
<Upload size={14} />
++<<<<<<< HEAD
+ <span className="text-sm font-medium">Upload logs folder</span>
++=======
+ <span className="text-sm font-medium">Upload log folder</span>
++>>>>>>> 11611cfb88e786ef16acf83733dc34f291596839
</button>
</header>
@@@ -130,7 -130,7 +134,11 @@@
className="w-full flex flex-col items-center justify-center rounded-lg border-2 border-dashed border-gray-500 p-12 text-center hover:border-gray-400 transition-all focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
>
<Upload size={48} className="text-gray-500" strokeWidth={1.5} />
++<<<<<<< HEAD
+ <span className="mt-2 block text-sm font-semibold text-gray-300">Upload logs folder</span>
++=======
+ <span className="mt-2 block text-sm font-semibold text-gray-300">Upload log folder</span>
++>>>>>>> 11611cfb88e786ef16acf83733dc34f291596839
</button>
</div>
)}