commit 465a3d2df67c7ea913bf6ff96d178074f4c813a6 Author: Akarshan Biswas <akarshan.biswas(a)gmail.com&gt; Date: Sun Apr 28 17:38:21 2019 +0000 Remove string created due to merge conflict chromium-vaapi.spec | 1 - 1 file changed, 1 deletion(-) --- diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec index dd8acd8..89846b6 100644 --- a/chromium-vaapi.spec +++ b/chromium-vaapi.spec @@ -234,7 +234,6 @@ chromium-vaapi is an open-source web browser, powered by WebKit (Blink) sed -i 's|const std::vector<Delta> deltas_;|std::vector<Delta> deltas_;|' chrome/browser/ui/tabs/tab_strip_model_observer.h %endif ->>>>>>> master #Let's change the default shebang of python files. find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} + ./build/linux/unbundle/remove_bundled_libraries.py --do-remove \