Skip to content

Commit 12c75f1

Browse files
committed
Merge branch 'master' into dev-refactoring
2 parents ba324b0 + a394039 commit 12c75f1

File tree

10 files changed

+900
-111
lines changed

10 files changed

+900
-111
lines changed

common/log.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "log.h"
22

3+
#include <chrono>
34
#include <condition_variable>
45
#include <cstdarg>
56
#include <cstdio>

examples/imatrix/imatrix.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "log.h"
44
#include "llama.h"
55

6+
#include <chrono>
67
#include <cmath>
78
#include <cstdio>
89
#include <cstring>

examples/perplexity/perplexity.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "log.h"
44
#include "llama.h"
55

6+
#include <chrono>
67
#include <algorithm>
78
#include <array>
89
#include <atomic>
1 Byte
Binary file not shown.

examples/server/webui/src/components/ChatMessage.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,12 @@ export default function ChatMessage({
254254
🔄 Regenerate
255255
</button>
256256
)}
257-
<CopyButton
258-
className="badge btn-mini show-on-hover mr-2"
259-
content={msg.content}
260-
/>
261257
</>
262258
)}
259+
<CopyButton
260+
className="badge btn-mini show-on-hover mr-2"
261+
content={msg.content}
262+
/>
263263
</div>
264264
)}
265265
</div>

0 commit comments

Comments
 (0)