diff options
| author | zachir <zachir@librem.one> | 2024-06-06 12:20:57 -0500 |
|---|---|---|
| committer | zachir <zachir@librem.one> | 2024-06-06 12:20:57 -0500 |
| commit | 83972d16872ee0181387808d1814d7c323a59dae (patch) | |
| tree | d0c1481fe8fd61de1e5ea1d6dceea9913eff87c6 /.gitignore | |
| parent | 478f45ca9f77ef7f86248708eb3db4498a783821 (diff) | |
| parent | 899297fc07bb6560b543741aff6c8d172429b090 (diff) | |
Merge branch 'master' into cas
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 9 |
1 files changed, 4 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 |