Merge conflict

1 files changed, 0 insertions, 89 deletions

diff --git a/elpa/auctex-13.1.3/images/dvips.xpm b/elpa/auctex-13.1.3/images/dvips.xpm
deleted file mode 100644
index 7d58e2d..0000000
--- a/elpa/auctex-13.1.3/images/dvips.xpm
+++ /dev/null
@@ -1,89 +0,0 @@
-/* XPM */
-static char * dvips66_xpm[] = {
-"24 24 62 1",
-" 	c None s backgroundToolBarColor",
-".	c #4C4C4C",
-"+	c #000000",
-"@	c #7C7C7C",
-"#	c #577A4D",
-"$	c #4C6B43",
-"%	c #37452B",
-"&	c #76996C",
-"*	c #9BB594",
-"=	c #648C58",
-"-	c #DAE3D6",
-";	c #445636",
-">	c #67865E",
-",	c #A7BDA0",
-"'	c #8EAB86",
-")	c #526741",
-"!	c #425D3A",
-"~	c #4C603C",
-"{	c #566B43",
-"]	c #5A7046",
-"^	c #869CB4",
-"/	c #00244C",
-"(	c #002248",
-"_	c #0050A9",
-":	c #006FEB",
-"<	c #0066D9",
-"[	c #00336D",
-"}	c #295E29",
-"|	c #5ABD5A",
-"1	c #001070",
-"2	c #004BA2",
-"3	c #0078FF",
-"4	c #0075FC",
-"5	c #004DB6",
-"6	c #00072F",
-"7	c #0047FF",
-"8	c #006DFF",
-"9	c #0042CA",
-"0	c #00169E",
-"a	c #000A45",
-"b	c #488148",
-"c	c #0024FF",
-"d	c #0027FF",
-"e	c #0056ED",
-"f	c #001FA7",
-"g	c #00179F",
-"h	c #4CA14C",
-"i	c #4D904D",
-"j	c #001DCE",
-"k	c #4FA64F",
-"l	c #000B4C",
-"m	c #0023F5",
-"n	c #001492",
-"o	c #000E65",
-"p	c #00010B",
-"q	c #001AB9",
-"r	c #0022F0",
-"s	c #001387",
-"t	c #000942",
-"u	c #0037C4",
-"v	c #6C84B7",
-"w	c #000C57",
-"      .+.      ++++     ",
-"    @+##$+@   +++%++    ",
-"    +&**&=+  +   +%+    ",
-"   .#*-*&=$.      +;+   ",
-"   +>,*'==$+      +)+   ",
-"   .#&&==#!.    ++))~++ ",
-"    +#==#$+      +{]{+  ",
-"    @+!$!+@       +)+   ",
-"      .+.          +    ",
-"                        ",
-"                  ^/    ",
-"                ^(_:<[  ",
-"}}}| }  }  }   12:333456",
-"}  } }  }  }   17833390a",
-"}  } b  b  }   1cd7efg0a",
-"}  } hiih  }   1cccj000a",
-"}  }  bb   }   1cccj000a",
-"}}}|  kk   }   lmccj0nop",
-"                lqrjst  ",
-"  uuuv vuuv       1w    ",
-"  u  u u                ",
-"  uuuv vuuv             ",
-"  u       u             ",
-"  u    vuuv             "};