sij/khoj
1
0
Fork 0
mirror of https://github.com/khoj-ai/khoj.git synced 2024-11-30 19:03:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merging issues with base after popping the stash

Browse source
This commit is contained in:
sabaimran 2023-11-20 15:22:50 -08:00
parent 8fa0b69c67
commit a8f13f334f
1 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/khoj/interface/web/chat.html
View file

@ -147,24 +147,6 @@ To get started, just start typing below. You can also type / to see a list of co
function processOnlineReferences(referenceSection, onlineContext) { function processOnlineReferences(referenceSection, onlineContext) {
let numOnlineReferences = 0; let numOnlineReferences = 0;
<<<<<<< Updated upstream
for (let subquery in onlineContext) {
let onlineReference = onlineContext[subquery];
if (onlineReference.organic && onlineReference.organic.length > 0) {
numOnlineReferences += onlineReference.organic.length;
for (let index in onlineReference.organic) {
let reference = onlineReference.organic[index];
let polishedReference = generateOnlineReference(reference, index);
referenceSection.appendChild(polishedReference);
}
||||||| Stash base
if (onlineContext.organic && onlineContext.organic.length > 0) {
numOnlineReferences += onlineContext.organic.length;
for (let index in onlineContext.organic) {
let reference = onlineContext.organic[index];
let polishedReference = generateOnlineReference(reference, index);
referenceSection.appendChild(polishedReference);
=======
for (let subquery in onlineContext) { for (let subquery in onlineContext) {
let onlineReference = onlineContext[subquery]; let onlineReference = onlineContext[subquery];
if (onlineReference.organic && onlineReference.organic.length > 0) { if (onlineReference.organic && onlineReference.organic.length > 0) {
@ -174,25 +156,8 @@ To get started, just start typing below. You can also type / to see a list of co
let polishedReference = generateOnlineReference(reference, index); let polishedReference = generateOnlineReference(reference, index);
referenceSection.appendChild(polishedReference); referenceSection.appendChild(polishedReference);
} }
>>>>>>> Stashed changes
} }
<<<<<<< Updated upstream
if (onlineReference.knowledgeGraph && onlineReference.knowledgeGraph.length > 0) {
numOnlineReferences += onlineReference.knowledgeGraph.length;
for (let index in onlineReference.knowledgeGraph) {
let reference = onlineReference.knowledgeGraph[index];
let polishedReference = generateOnlineReference(reference, index);
referenceSection.appendChild(polishedReference);
}
||||||| Stash base
if (onlineContext.knowledgeGraph && onlineContext.knowledgeGraph.length > 0) {
numOnlineReferences += onlineContext.knowledgeGraph.length;
for (let index in onlineContext.knowledgeGraph) {
let reference = onlineContext.knowledgeGraph[index];
let polishedReference = generateOnlineReference(reference, index);
referenceSection.appendChild(polishedReference);
=======
if (onlineReference.knowledgeGraph && onlineReference.knowledgeGraph.length > 0) { if (onlineReference.knowledgeGraph && onlineReference.knowledgeGraph.length > 0) {
numOnlineReferences += onlineReference.knowledgeGraph.length; numOnlineReferences += onlineReference.knowledgeGraph.length;
for (let index in onlineReference.knowledgeGraph) { for (let index in onlineReference.knowledgeGraph) {
@ -200,7 +165,6 @@ To get started, just start typing below. You can also type / to see a list of co
let polishedReference = generateOnlineReference(reference, index); let polishedReference = generateOnlineReference(reference, index);
referenceSection.appendChild(polishedReference); referenceSection.appendChild(polishedReference);
} }
>>>>>>> Stashed changes
} }
if (onlineReference.peopleAlsoAsk && onlineReference.peopleAlsoAsk.length > 0) { if (onlineReference.peopleAlsoAsk && onlineReference.peopleAlsoAsk.length > 0) {