Uploaded image for project: 'Core ReactOS'
  1. Core ReactOS
  2. CORE-13102

rossubsys/os2/lib/doscalls/*: fix (diff) unresolved conflicts in r7934

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Untriaged
    • Priority: Trivial
    • Resolution: Unresolved
    • Fix Version/s: None
    • Component/s: Other
    • Labels:
      None

      Description

      Fix (diff) unresolved conflicts in r7934 (by [~robert_kopec]).

      It looks like intended goal was (mainly) to remove "32" in the function names.

      "<<<<<<< " grep

      rossubsys/os2/lib/doscalls/doscalls.def
        13 <<<<<<< doscalls.def
      rossubsys/os2/lib/doscalls/doscalls.edf
        13 <<<<<<< doscalls.edf
      rossubsys/os2/lib/doscalls/file/openclose.cpp
        23 <<<<<<< openclose.cpp

        Attachments

          Activity

            People

            • Assignee:
              bug zilla Bug Zilla
              Reporter:
              Serge Gautherie Serge Gautherie
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated: