Merge conflict

1 files changed, 0 insertions, 83 deletions

diff --git a/elpa/auctex-13.1.3/images/pspdf.xpm b/elpa/auctex-13.1.3/images/pspdf.xpm
deleted file mode 100644
index 78d2887..0000000
--- a/elpa/auctex-13.1.3/images/pspdf.xpm
+++ /dev/null
@@ -1,83 +0,0 @@
-/* XPM */
-static char * pspdf5_xpm[] = {
-"24 24 56 1",
-" 	c None s backgroundToolBarColor",
-".	c #869CB4",
-"+	c #00244C",
-"@	c #000000",
-"#	c #002248",
-"$	c #0050A9",
-"%	c #006FEB",
-"&	c #0066D9",
-"*	c #00336D",
-"=	c #37452B",
-"-	c #001070",
-";	c #004BA2",
-">	c #0078FF",
-",	c #0075FC",
-"'	c #004DB6",
-")	c #00072F",
-"!	c #0047FF",
-"~	c #006DFF",
-"{	c #0042CA",
-"]	c #00169E",
-"^	c #000A45",
-"/	c #445636",
-"(	c #0024FF",
-"_	c #0027FF",
-":	c #0056ED",
-"<	c #001FA7",
-"[	c #00179F",
-"}	c #526741",
-"|	c #001DCE",
-"1	c #4C603C",
-"2	c #566B43",
-"3	c #5A7046",
-"4	c #000B4C",
-"5	c #0023F5",
-"6	c #001492",
-"7	c #000E65",
-"8	c #00010B",
-"9	c #001AB9",
-"0	c #0022F0",
-"a	c #001387",
-"b	c #000942",
-"c	c #000C57",
-"d	c #D37F71",
-"e	c #0037C4",
-"f	c #6C84B7",
-"g	c #CE918A",
-"h	c #D4897A",
-"i	c #67102D",
-"j	c #C47474",
-"k	c #D69788",
-"l	c #CB8984",
-"m	c #D79C8D",
-"n	c #C8807D",
-"o	c #5A5A5A",
-"p	c #B50000",
-"q	c #AA7979",
-"     .+       @@@@      ",
-"   .#$%&*    @@@=@@     ",
-"  -;%>>>,') @   @=@     ",
-"  -!~>>>{]^      @/@    ",
-"  -(_!:<[]^      @}@    ",
-"  -(((|]]]^    @@}}1@@  ",
-"  -(((|]]]^     @232@   ",
-"  45((|]678      @}@    ",
-"   490|ab         @     ",
-"     -c                 ",
-"                  @     ",
-"                 @d@    ",
-" eeef feef      @ghi@   ",
-" e  e e        @jgkii@  ",
-" eeef feef    @jlgmiii@ ",
-" e       e   @jnlgmiiii@",
-" e    e  e   @jnlgkiii@ ",
-" e    feef    o@jnhii@  ",
-"                o@di@   ",
-"pppq pppq pppq    @@    ",
-"p  p p  p p             ",
-"pppq p  p ppq           ",
-"p    p  p p             ",
-"p    pppq p             "};