@@ -86,11 +86,6 @@ <string>4027DB25-6790-444F-82A2-08D5113A6786</string> <string>5FD94CDD-7F29-4DE9-9175-51605381A2E6</string> <string>8C312D56-4B39-438A-815B-0E36115A6F11</string> -<<<<<<< .mine - <string>04CC33D1-C24C-4B75-8D15-9AE1193C343C</string> - <string>B6DAB3DA-0E30-485E-90DD-EBDCDFF8CBF4</string> -======= ->>>>>>> .r11607 </array> <key>uuid</key> <string>5B1D8959-F6BB-4F99-9E28-C97BFF447DF6</string> Review/Bundles/Mx.tmbundle/info.plist 0b086b55d3f3d43e753da72937b15dc26a81f647 tbates tbates@dfb7d73b-c2ec-0310-8fea-fb051d288c6d http://github.com/kballard/textmate-bundles/commit/8c27f4fdb56f1d9e67e07f71197bd32277e201a9 8c27f4fdb56f1d9e67e07f71197bd32277e201a9 2009-10-26T14:54:10-07:00 2009-10-26T14:54:10-07:00 repaired plist git-svn-id: http://svn.textmate.org/trunk@11793 dfb7d73b-c2ec-0310-8fea-fb051d288c6d 0a5e9b2b08e868b5f6f0b478ee6f9e7487592a60 tbates tbates@dfb7d73b-c2ec-0310-8fea-fb051d288c6d