Changeset c62f2d0 in mainline

Timestamp:

2011-07-23T20:25:46Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e478cebf

Parents:

df217a6

Message:

Corrected merge conflict in unistd.c.

File:

• uspace/lib/posix/unistd.c (modified) (1 diff)

uspace/lib/posix/unistd.c

@@ -89 +89 @@
 {
         /* Always returns false, because there is no easy way to find
-<<<<<<< TREE
      * out under HelenOS. */
         return 0;
-=======
-         * out under HelenOS. */
-        return false;
->>>>>>> MERGE-SOURCE
 }