diff options
author | zachir <zachir@librem.one> | 2024-06-06 21:14:56 -0500 |
---|---|---|
committer | zachir <zachir@librem.one> | 2024-06-06 21:14:56 -0500 |
commit | 0dc0fdfed34d9c8722651b7e057bfe14bb266862 (patch) | |
tree | 44b3505a2559507246a150b2d0f8064b19787621 /.gitignore | |
parent | 04cb03f85f093eb1ba33398708862e9a2e9e17b3 (diff) | |
parent | f2956712c043c592e1c52eedbd4a901e8bb7423f (diff) |
Merge remote-tracking branch 'origin/master' into cla
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -70,12 +70,11 @@ gnome-session/ goa-1.0/ godot/ gomuks/ -gtk-2.0/ -gtk-3.0/ -gtkrc -gtkrc-2.0 +gtk-2.0/* +!gtk-2.0/gtkrc +gtk-3.0/* +!gtk-3.0/settings.ini guitarix/ -<<<<<<< HEAD Hellbeast v2/ Hellbeast v2.settings htop/htoprc @@ -165,6 +164,7 @@ odysee-nativefier*/ okularpartrc okularrc openrazer/ +package-lock.json pavucontrol.ini pcmanfm/ pcmanfm-qt/ @@ -211,6 +211,9 @@ Resonant DSP/ retroarch/ rncbc.org/ rtorrent/ +runit/sv/*/supervise +runit/sv/*/*/supervise +runit/runsvdir/* RVXX EXEX.settings RVXX v2/ RVXX v2.settings @@ -268,6 +271,7 @@ xmonad/xmonad.o xmonad/xmonad-x86_64-linux xsettingsd/ yabridgectl/ +yarn/ ytfzf/subscriptions yuzu/ zec-qt-wallet-org/ |