Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset c62f2d0 in mainline


Ignore:
Timestamp:
2011-07-23T20:25:46Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
e478cebf
Parents:
df217a6
Message:

Corrected merge conflict in unistd.c.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/posix/unistd.c

    rdf217a6 rc62f2d0  
    8989{
    9090        /* Always returns false, because there is no easy way to find
    91 <<<<<<< TREE
    9291     * out under HelenOS. */
    9392        return 0;
    94 =======
    95          * out under HelenOS. */
    96         return false;
    97 >>>>>>> MERGE-SOURCE
    9893}
    9994
Note: See TracChangeset for help on using the changeset viewer.