Skip to content

Commit

Permalink
merges are hard some times
Browse files Browse the repository at this point in the history
  • Loading branch information
@zadjii-msft
zadjii-msft committed Feb 10, 2023
1 parent dffb416 commit a769933
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 11 deletions.
7 changes: 0 additions & 7 deletions src/cascadia/TerminalApp/TerminalPage.idl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,8 @@ namespace TerminalApp

interface IWindowProperties
{
<<<<<<< HEAD
String WindowName;
UInt64 WindowId;
=======
String WindowName { get; };
UInt64 WindowId { get; };
>>>>>>> dev/migrie/oop/3/foreword
String WindowNameForDisplay { get; };
String WindowIdForDisplay { get; };
Boolean IsQuakeWindow();
Expand All @@ -47,8 +42,6 @@ namespace TerminalApp
void IdentifyWindow();
void RenameFailed();

IWindowProperties WindowProperties { get; };

// We cannot use the default XAML APIs because we want to make sure
// that there's only one application-global dialog visible at a time,
// and because of GH#5224.
Expand Down
2 changes: 0 additions & 2 deletions src/cascadia/TerminalSettingsModel/GlobalAppSettings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
Model::Theme CurrentTheme() noexcept;
bool ShouldUsePersistedLayout() const;

bool ShouldUsePersistedLayout() const;

void ExpandCommands(const Windows::Foundation::Collections::IVectorView<Model::Profile>& profiles,
const Windows::Foundation::Collections::IMapView<winrt::hstring, Model::ColorScheme>& schemes);

Expand Down
2 changes: 0 additions & 2 deletions src/cascadia/WindowsTerminal/AppHost.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ class AppHost

static void s_DisplayMessageBox(const winrt::TerminalApp::ParseCommandlineResult& message);

winrt::TerminalApp::TerminalWindow Logic();

private:
std::unique_ptr<IslandWindow> _window;

Expand Down

1 comment on commit a769933

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@check-spelling-bot Report

🔴 Please review

See the 📜action log for details.

Unrecognized words (15) 
accessort
APeasant
Apphost
applogic
backchannel
becuase
chould
connectecd
definted
dxgidebug
Faile
fuction
propogating
RLO
vaugely
Previously acknowledged words that are now absent CLA demoable everytime Hirots inthread reingest unmark :arrow_right:
To accept ✔️ these unrecognized words as correct and remove the previously acknowledged and now absent words, run the following commands

... in a clone of the [email protected]:microsoft/terminal.git repository
on the dev/migrie/oop/3/ainulindale branch (ℹ️ how do I use this?):

curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/v0.0.21/apply.pl' |
perl - 'https://github.com/microsoft/terminal/actions/runs/4148455939/attempts/1'
Errors (1)

See the 📜action log for details.

❌ Errors Count
❌ forbidden-pattern 1

See ❌ Event descriptions for more information.

✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

⚠️ The command is written for posix shells. If it doesn't work for you, you can manually add (one word per line) / remove items to expect.txt and the excludes.txt files.

If the listed items are:

  • ... misspelled, then please correct them instead of using the command.
  • ... names, please add them to .github/actions/spelling/allow/names.txt.
  • ... APIs, you can add them to a file in .github/actions/spelling/allow/.
  • ... just things you're using, please add them to an appropriate file in .github/actions/spelling/expect/.
  • ... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spelling/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

Please sign in to comment.