-
Notifications
You must be signed in to change notification settings - Fork 0
/
jmhkiots.4sz.txt
71 lines (67 loc) · 3.59 KB
/
jmhkiots.4sz.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
Github is not very bright. Merge remote-tracking branch 'origin/master'
Conflicts:
src/MasterBot/Room/Room.cs
src/MasterBot/SubBot/Houses/FurnitureManager.cs
src/MasterBot/SubBot/Houses/HouseBuilding.cs
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 3 different commits each, respectively.
# (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# modified: .gitignore
# modified: src/MasterBot/MasterBot.csproj
# modified: src/MasterBot/Room/Room.cs
# modified: src/MasterBot/SubBot/Houses/FurnitureManager.cs
# modified: src/MasterBot/SubBot/Houses/Furnitures/Furniture.cs
# modified: src/MasterBot/SubBot/Houses/Furnitures/FurnitureEmpty.cs
# deleted: src/MasterBot/SubBot/Houses/Furnitures/FurnitureLockedDoor.cs
# modified: src/MasterBot/SubBot/Houses/Furnitures/FurnitureSpawn.cs
# modified: src/MasterBot/SubBot/Houses/Furnitures/FurnitureSwitch.cs
# modified: src/MasterBot/SubBot/Houses/Furnitures/FurnitureSwitchDoor.cs
# modified: src/MasterBot/SubBot/Houses/HouseBuilding.cs
# modified: src/MasterBot/SubBot/Houses/HouseManager.cs
# deleted: src/MasterBot/bin/Release/AntiGodEdit/AntiGodEdit.cs
# deleted: src/MasterBot/bin/Release/AntiGodEdit/AntiGodEdit.csproj
# deleted: src/MasterBot/bin/Release/AntiGodEdit/Properties/AssemblyInfo.cs
# deleted: src/MasterBot/bin/Release/Class1.cs
# deleted: src/MasterBot/bin/Release/Install Me (Plugin Template).vstemplate
# deleted: src/MasterBot/bin/Release/MasterBotPlugins.sln
# deleted: src/MasterBot/bin/Release/PluginExample/PluginExample.cs
# deleted: src/MasterBot/bin/Release/PluginExample/PluginExample.csproj
# deleted: src/MasterBot/bin/Release/PluginExample/PluginExample.resx
# deleted: src/MasterBot/bin/Release/PluginExample/Properties/AssemblyInfo.cs
# deleted: src/MasterBot/bin/Release/PluginTemplate.csproj
# deleted: src/MasterBot/bin/Release/PluginTemplate/Class1.cs
# deleted: src/MasterBot/bin/Release/PluginTemplate/PluginTemplate.csproj
# deleted: src/MasterBot/bin/Release/PluginTemplate/Properties/AssemblyInfo.cs
# deleted: src/MasterBot/bin/Release/Properties/AssemblyInfo.cs
# deleted: src/MasterBot/bin/Release/SandCelluralAutomaton/Properties/AssemblyInfo.cs
# deleted: src/MasterBot/bin/Release/SandCelluralAutomaton/SandCelluralAutomaton.cs
# deleted: src/MasterBot/bin/Release/SandCelluralAutomaton/SandCelluralAutomaton.csproj
# deleted: src/MasterBot/bin/Release/SimpleChat/Gui/RichTextBoxConsoleChild.cs
# deleted: src/MasterBot/bin/Release/SimpleChat/Properties/AssemblyInfo.cs
# deleted: src/MasterBot/bin/Release/SimpleChat/SimpleChat.cs
# deleted: src/MasterBot/bin/Release/SimpleChat/SimpleChat.csproj
# deleted: src/MasterBot/bin/Release/SimpleChat/SimpleChat.resx
# deleted: src/MasterBot/bin/Release/__PreviewImage.png
# deleted: src/MasterBot/bin/Release/__TemplateIcon.png
# deleted: src/MasterBot/bin/Release/data/gbot
# deleted: src/MasterBot/bin/Release/data/houses
# deleted: src/MasterBot/bin/Release/data/pikachu516
# deleted: src/MasterBot/bin/Release/image 1000.png
# deleted: src/MasterBot/bin/Release/image 979.png
# deleted: src/MasterBot/bin/Release/image 994.png
#
# Untracked files:
# src/MasterBot/SubBot/Houses/Furnitures/FurnitureDoor.cs
#