| #!/usr/bin/env sh | |
| # Download lists, unpack and filter, write to stdout | |
| curl -s https://www.iblocklist.com/lists.php \ | |
| | sed -n "s/.*value='\(http:.*=bt_.*\)'.*/\1/p" \ | |
| | xargs wget -O - \ | |
| | gunzip \ | |
| | egrep -v '^#' |
| #!/bin/bash | |
| ## | |
| ## --exclude takes one pool or a comma seperated list of pools | |
| ## | |
| ## Example: scrub-all.sh --exclude rpool | |
| ## Example: scrub-all.sh --exclude rpool,tank-foo,tank-bar | |
| ## | |
| EMAIL_RECIPIENT="foo@bar.com" |
| # Maintainer: Vincent Cheung <coolingfall@gmail.com> | |
| _target=arm-linux-gnueabihf | |
| _pkgdate=2019.02 | |
| pkgname=${_target}-gcc-linaro-bin | |
| pkgver=7.4 | |
| pkgrel=1 | |
| epoch= |
| [Nov29 18:01] usb 5-4: USB disconnect, device number 9 | |
| [ +0.000122] rndis_host 5-4:1.0 enp10s0f3u4: unregister 'rndis_host' usb-0000:0a:00.3-4, RNDIS device | |
| [ +0.029849] sd 10:0:0:0: [sdh] Synchronizing SCSI cache | |
| [ +0.000026] sd 10:0:0:0: [sdh] Synchronize Cache(10) failed: Result: hostbyte=DID_NO_CONNECT driverbyte=DRIVER_OK | |
| [Nov29 18:02] usb 5-4: new high-speed USB device number 10 using xhci_hcd | |
| [ +0.140362] usb 5-4: New USB device found, idVendor=18d1, idProduct=0001, bcdDevice= 1.01 | |
| [ +0.000004] usb 5-4: New USB device strings: Mfr=2, Product=3, SerialNumber=4 | |
| [ +0.000002] usb 5-4: Product: PocketBook740-2 | |
| [ +0.000002] usb 5-4: Manufacturer: Obreey |
| F_Word F_Offset F_Size F_ChunckNum | |
| a 0 574 1 | |
| à 574 2523 1 | |
| aa 3097 275 1 | |
| aâda 3372 287 1 | |
| ababa 3659 333 1 | |
| abaca 3992 216 1 | |
| abacost 4208 396 1 | |
| abader 4604 423 1 | |
| abaissant 5027 141 1 |
| -- PetitRobert2007 HTML cleanup | |
| local Screen = require("device").screen | |
| local logger=require("logger") | |
| local util=require("util") | |
| -- From http://lua-users.org/wiki/LuaXml | |
| -- Pure lua XML parsing |
| <k>a</k> | |
| <b><font color="darkmagenta">▪ <font>I.</font></font></b> <b><abr>†</abr> a, <abr>a.</abr><sup>1</sup> (<abr>def.</abr> numeral)</b> <i><abr>Obs.</abr></i> or <i><abr>dial.</abr></i> | |
| <blockquote><blockquote><blockquote><blockquote><font color="gray">[<abr>OE.</abr> <i>án</i>, one, of which the <i>n</i> began to disappear before a <abr>cons.</abr> about 1150. In the definite numeral sense, <i>án</i> and <i>á</i>, following the ordinary course of <abr>OE.</abr> long <i>á</i>, became in the south <abr>bef.</abr> 1300, <i>on</i> (<i>oon</i>, <i>one</i>), <i>o</i> (<i>oo</i>); and eventually <i>o</i> became <abr>obs.</abr>, leaving <i>one</i> as the form in all positions; while <i>an</i> and <i>a</i>, pronounced lightly and indistinctly, became the ‘indefinite article.’ See next word. But in the north <i>an</i> (or <i>ane</i>) and <i>a</i> were written in both senses, the stress or emphasis alone distinguishing the numeral from the article.]</font></blockquote></blockquote></blockquote></blockquote> | |
| <b |
| # Maintainer: Muflone http://www.muflone.com/contacts/english/ | |
| # Contributor: Frederic Bezies < fredbezies at gmail dot com> | |
| # Contributor: garion < garion @ mailoo.org > | |
| # Contributor: Alessio Sergi <asergi at archlinux dot us> | |
| pkgname=iscan | |
| pkgver=2.30.3.1 | |
| pkgrel=2 | |
| pkgdesc="EPSON Image Scan! front-end for scanners and all-in-ones" | |
| arch=('x86_64') |
| ro.secure=0 | |
| ro.allow.mock.location=1 | |
| ro.debuggable=1 | |
| persist.sys.usb.config=adb | |
| ro.adb.secure=0 |
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)