[llvm-commits] [llvm] r155300 - in /llvm/trunk: ./ include/llvm/Module.h lib/Linker/LinkModules.cpp lib/VMCore/Module.cpp

[Bill Wendling]

On Apr 21, 2012, at 5:08 PM, Chandler Carruth wrote:

> On Sat, Apr 21, 2012 at 4:59 PM, Bill Wendling <isanbard at gmail.com> wrote:
> Propchange: llvm/trunk/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sat Apr 21 18:59:16 2012
> @@ -1,2 +1,3 @@
>  /llvm/branches/Apple/Pertwee:110850,110961
>  /llvm/branches/type-system-rewrite:133420-134817
> +/llvm/trunk:155241
> 
> This seems a touch odd...

I think it can be safely ignored? (Maybe?) It seems like an artifact of an svn merge I did to test things...

-bw