aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/.~lock.shell.nix#1
-rwxr-xr-xsrc/sketch.py5
2 files changed, 6 insertions, 0 deletions
diff --git a/src/.~lock.shell.nix# b/src/.~lock.shell.nix#
new file mode 100644
index 0000000..51a425a
--- /dev/null
+++ b/src/.~lock.shell.nix#
@@ -0,0 +1 @@
+,sara,fading2.ost.ch,06.11.2021 14:06,file:///home/sara/.config/libreoffice/4; \ No newline at end of file
diff --git a/src/sketch.py b/src/sketch.py
index 9d65a87..02bd012 100755
--- a/src/sketch.py
+++ b/src/sketch.py
@@ -68,8 +68,13 @@ with window(label="RX DSP Flow Graph", width=800, height=800, on_close=_on_param
add_node_link(get_alias_id("eq_out"), get_alias_id("pll_in"))
+<<<<<<< HEAD
+with window(label="Example Window"):
+ add_text("Hello world")
+=======
#================================================
# Start window and main loop
+>>>>>>> origin/master
show_viewport()
start_dearpygui()