gistfile1.txt

sidekick:groupy jordanisip$ git pull --rebase
remote: Counting objects: 175, done.
remote: Compressing objects: 100% (86/86), done.
remote: Total 133 (delta 58), reused 113 (delta 42)
Receiving objects: 100% (133/133), 22.99 KiB, done.
Resolving deltas: 100% (58/58), completed with 9 local objects.
From git@github.com:joevandyk/groupy
   d01dfa2..8c0bfd7  master     -> origin/master
First, rewinding head to replay your work on top of it...
HEAD is now at 8c0bfd7... Subdomains should work now.  (be sure to add them to /etc/localhost when developing!)
Applying Quick style fixes
Applying Cleaning up
.dotest/patch:63: trailing whitespace.
<</Metadata 139 0 R/Pages 2 0 R/OCProperties<</D<</RBGroups[]/ON[14 0 R 18 0 R 57 0 R 66 0 R 106 0 R 110 0 R]/Order 105 0 R>>/OCGs[14 0 R 18 0 R 57 0 R 66 0 R 106 0 R 110 0 R]>>/<</Subtype/XML/Length 55134/Type/Metadata>>stream
.dotest/patch:222: trailing whitespace.
<</OPM 1/BM/Normal/CA 1.0/OP false/SMask/None/ca 1.0/AIS false/op false/Type/ExtGState/SA<</Subtype/TrueType/FontDescriptor 123 0 R/LastChar 121/Widths[278 0 0 0 0 0 0 0 333 333 0 0 0 0 0 0 556 556 556 0 0 556 0 556 556 0 0 0 0 0 0 0 0 0 722 0 0 0 0 0 0 0 556 0 0 833 722 0 667 0 722 667 0 0 0 0 0 0 0 0 0 0 0 0 0 556 611 0 611 556 0 611 611 278 0 0 278 0 611 611 611 0 389 556 333 611 556 778 556 556]/BaseFont/IONUZL+Arial-BoldMT/FirstChar 32/<</Subtype/TrueType/FontDescriptor 125 0 R/LastChar 187/Widths[278 278 0 0 0 0 0 0 333 333 0 0 278 333 278 278 556 556 556 556 556 556 556 556 556 556 278 0 584 0 584 0 0 667 667 722 722 667 0 0 722 0 500 0 0 833 722 0 667 0 722 667 611 722 667 944 0 0 0 0 0 0 0 0 0 556 556 500 556 556 278 556 556 222 222 500 222 833 556 556 556 556 333 500 278 556 500 722 500 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 222 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 556 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 556]/BaseFont/IONUZL+ArialMT/Firs<</Subtype/Type1/FontDescriptor 127 0 R/LastChar 117/Widths[742 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 622 557 0 0 0 299 0 0 0 0 0 623 621 0 412 0 0 638]/BaseFon<</StemV 128/FontName/HGDOLN+Museo700-Regular/FontStretch/Normal/FontFile3 135 0 R/FontWeight 700/Flags 34/Descent -237/FontBBox[-53 -237 1158 902]/Ascent 902/FontFamily(Museo 70<</Subtype/Type1C/Length 988/Filter/FlateDecode>>streamAngle 0>>
.dotest/patch:281: trailing whitespace.
??}?ʄ?B?^Jq!?V$JE*U??+9??H??I?lWm???M?F?^?????WzN??????T^M??$??7???d?/˒@iL????iP?T!P??$+?XN??'???a#?)?4???D?R?    H?q|
                            ?"G??l`?gjr?q+??`??0?p??ri?K?X#?Ї??
                                                               ?? ?Hy????PM?8&N7?G`??n??+?$>Q?|??̃?៾[ O?Lr?`֛?-?߾d?4?????<??.??6??6?,??nKG???s[:?@/?'?    ????m???9@ut[:sc(?::????h???????v???-?U? rsp?e???
     fb_????k
             ??????
                   o?    {`?n?3=??

ކ?4?YlV?1??t??MlS?m޶?b{-        ???Z <+>?-0?n?x4K?%?2Cf~,?+?zi??Ԥ|GjQ??Y?
                                                      Q???;?},???>??Vesx??~v?8A??&
                                                                                  ?`e ??c??2?dS?Ȃ<?"h["M?????3?,?z???[????kQ? "??-??ܸ?D5??}???xz0????Q?&H-??vֶ?9?u??H??7?G|f5??0q??hꮟ??7?x?b??ގ?z?m???}?rۚ??̩?0q?<q?/GO??#?BKA/&?R?
                                             ?Q?[f?I????$?-_<?xy?3?Ԇj????N???h5;??R??l
                                                                                      -u?"??????????P$?q3?@k??t?9??L?Q?5u?-??????:?.(?׈?????&?F?    ??jJg@j????C?9b?ΎA??Z????V__?q\? ?E??[???$?M???1A5&??+?lK??̰?G1?m
                                   ?????j??͇????s??b=1j-?f??k???j0??Y????<?:vվ???????a???X?kֽ?{?ʞl???O?~?gCo?????'k3_    ?N9q???1??+:?]a1?K8??T?Tg?o???EgaxS??t?{U?n??6?ˌx???`<?O7??-?'Ƨ???????]?C??_X??n?_D??????f?????g?g???S:g??x?z??"=;vO????'?ΚI2O?z??????,_??dZ&w6???\?^?ː????E>?W?&?d?}??L<?:@????p??B&Y    Nhx?<T?ѣ??? ???~?h??L??׭?޳f?;?^??H??+??{۝)?N??ӱ3玱??P???S??#&%Q??S??]E%?RTEu?,??   
fatal: corrupt patch at line 622
Patch failed at 0002.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".