Skip to content
This repository has been archived by the owner on Aug 10, 2022. It is now read-only.

Why does my computer do weird things? #42

Merged
merged 1 commit into from
May 1, 2015
Merged

Why does my computer do weird things? #42

merged 1 commit into from
May 1, 2015

Conversation

kjsmita6
Copy link
Member

@kjsmita6 kjsmita6 commented May 1, 2015

No description provided.

kjsmita6 added a commit that referenced this pull request May 1, 2015
Why does my computer do weird things?
@kjsmita6 kjsmita6 merged commit 49f0985 into Steam-Chat-Bot:master May 1, 2015
@Efreak
Copy link
Member

Efreak commented May 3, 2015

This is a merge issue. It means the file was changed remotely and on your computer during the same commits.

>>>>>
This stuff was there before
=====
This stuff is new
<<<<<

(I might have those backward)

Efreak pushed a commit that referenced this pull request Aug 13, 2015
Efreak pushed a commit that referenced this pull request Aug 13, 2015
Stand-alone helper. Low risk. Merging. Addresses issue #42.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants