diff options
author | Mubashshir | 2023-01-07 22:55:54 +0600 |
---|---|---|
committer | Mubashshir | 2023-01-07 23:47:05 +0600 |
commit | ab97ca76b6652066cc75d6a25e60a6df2e5b7995 (patch) | |
tree | 01d6f35eda297f75a64abb9570cb3667d7bd0024 /.gitignore | |
parent | 2e506bc5eb356cde5d91bb4e514e7f2323e35b9f (diff) | |
download | aur-ab97ca76b6652066cc75d6a25e60a6df2e5b7995.tar.gz |
lib32-gst-bad-ugly: Fix conflicts
Signed-off-by: Mubashshir <ahmubashshir@gmail.com>
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 44cb76f637a7..c3d478557806 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,7 @@ * !PKGBUILD !.SRCINFO -!0000-Allow-disabling-gstreamer.patch -!0001-meson-Allow-building-with-system-orc.patch !0002-HACK-meson-Disable-broken-tests.patch !0003-HACK-meson-Work-around-broken-detection-of-underscor.patch !.gitignore +!0001-Allow-disabling-gstreamer.patch |