Resolve merge conflicts and fix some import ordering

This commit is contained in:
sabaimran
2023-11-21 12:30:43 -08:00
69 changed files with 257 additions and 268 deletions

View File

@@ -3,11 +3,12 @@ import json
import os
from pathlib import Path
from khoj.database.models import KhojUser, LocalPlaintextConfig
from khoj.processor.data_sources.plaintext.plaintext_to_entries import PlaintextToEntries
# Internal Packages
from khoj.utils.fs_syncer import get_plaintext_files
from khoj.utils.rawconfig import TextContentConfig
from khoj.processor.data_sources.plaintext.plaintext_to_entries import PlaintextToEntries
from database.models import LocalPlaintextConfig, KhojUser
def test_plaintext_file(tmp_path):