chore: fix merge errors

jupyterlab · Sep 11, 2024 · bfe2d04 · bfe2d04
2 parents e974ca3 + 1817b3c
commit bfe2d04
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/jupyterlab_latex/build.py b/jupyterlab_latex/build.py
@@ -138,6 +138,10 @@ def bib_condition(self):
 
     def filter_output(self, latex_output):
         """Filters latex output for "interesting" messages
+<<<<<<< HEAD
+=======
+
+>>>>>>> upstream/ux-improvements
         Parameters
         ----------
         latex_output: string
@@ -204,7 +208,6 @@ def filter_output(self, latex_output):
             if print_next:
                 filtered_output.append(line)
                 print_next = False
-
             elif ignore.match(line):
                 continue
 

diff --git a/sample.tex b/sample.tex
@@ -60,4 +60,4 @@ \subsection{We can add new subsections}
 
 You can also use SyncTeX by typing ⌘(CMD)/CTRL+⇧(SHIFT)+X.
 
-\end{document}
+\end{document}
diff --git a/src/index.ts b/src/index.ts
@@ -264,7 +264,7 @@ function activateLatexPlugin(
 ): void {
   const { commands } = app;
   const id = 'jupyterlab-latex';
-
+  
   const icon = new LabIcon({
     name: 'launcher:latex-icon',
     svgstr: latexIconStr

diff --git a/yarn.lock b/yarn.lock
@@ -572,6 +572,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jupyterlab/attachments@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@jupyterlab/attachments@npm:4.0.0"
+  dependencies:
+    "@jupyterlab/nbformat": ^4.0.0
+    "@jupyterlab/observables": ^5.0.0
+    "@jupyterlab/rendermime": ^4.0.0
+    "@jupyterlab/rendermime-interfaces": ^3.8.0
+    "@lumino/disposable": ^2.1.1
+    "@lumino/signaling": ^2.1.1
+  checksum: 71c8e488a0d31e00e1345336edece04faa0d2b6fbf5de284fad05bb2a8f732c57e9b2ffe10999dd416a1d00cdce4bc425f9f88dd91684cb8b55eea52a1d5ed98
+  languageName: node
+  linkType: hard
+
 "@jupyterlab/builder@npm:^4.0.0":
   version: 4.2.5
   resolution: "@jupyterlab/builder@npm:4.2.5"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,4 +60,4 @@ \subsection{We can add new subsections}

		You can also use SyncTeX by typing ⌘(CMD)/CTRL+⇧(SHIFT)+X.

		\end{document}
		\end{document}