Skip to content

Commit 4a9cd22

Browse files
author
Adam Schlesinger
committed
Resolved rebase artifacts
1 parent b75f358 commit 4a9cd22

File tree

10 files changed

+9
-103
lines changed

10 files changed

+9
-103
lines changed

‎OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,4 @@
11
{
2-
<<<<<<< main
3-
"name": "OneSignal.UnityPackage.Attribution",
4-
"rootNamespace": "",
5-
"references": [
6-
"OneSignal.Core"
7-
],
8-
"includePlatforms": [
9-
"Android",
10-
"Editor",
11-
"iOS"
12-
],
13-
"excludePlatforms": [],
14-
"allowUnsafeCode": false,
15-
"overrideReferences": false,
16-
"precompiledReferences": [],
17-
"autoReferenced": true,
18-
"defineConstraints": [],
19-
"versionDefines": [
20-
{
21-
"name": "com.onesignal.unity.core",
22-
"expression": "0.0.1-preview",
23-
"define": "ONE_SIGNAL_INSTALLED"
24-
}
25-
],
26-
"noEngineReferences": false
27-
=======
282
"name": "OneSignal.UnityPackage.Attribution",
293
"rootNamespace": "",
304
"references": [
@@ -49,5 +23,4 @@
4923
}
5024
],
5125
"noEngineReferences": false
52-
>>>>>>> Add install check scripting define to VSP
5326
}

‎OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef.meta

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OneSignalExample/Assets/OneSignal/CHANGELOG.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,10 @@ If you run into any problems, please don’t hesitate to [open an issue](https:/
7676
- If you are updating from a previous version of the OneSignal Unity SDK please follow the Unity Asset Store instructions in
7777
the [README](https://github.com/OneSignal/OneSignal-Unity-SDK/README.md#unity-asset-store) to ensure a smooth transition.
7878

79-
<<<<<<< main
80-
[Unreleased]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/2.14.5...HEAD
81-
=======
8279
[Unreleased]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.0-beta.2...HEAD
8380
[3.0.0-beta.2]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.0-beta.1...3.0.0-beta.2
84-
[3.0.0-beta.1]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/2.14.4...3.0.0-beta.1
85-
>>>>>>> Updated CHANGELOG
81+
[3.0.0-beta.1]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/2.14.6...3.0.0-beta.1
82+
[2.14.6]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/2.14.5...2.14.6
8683
[2.14.5]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/2.14.4...2.14.5
8784
[2.14.4]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/2.14.3...2.14.4
8885
[2.14.3]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/2.14.2...2.14.3

‎OneSignalExample/Assets/OneSignal/Editor/Resources/OneSignalFileInventory.asset

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,8 @@ MonoBehaviour:
2828
- Assets/OneSignal/VERSION.meta
2929
- Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef
3030
- Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef.meta
31-
<<<<<<< main
32-
- Assets/OneSignal/Attribution/VSPAttribution.cs
33-
- Assets/OneSignal/Attribution/VSPAttribution.cs.meta
34-
=======
3531
- Assets/OneSignal/Attribution/VspAttribution.cs
3632
- Assets/OneSignal/Attribution/VspAttribution.cs.meta
37-
>>>>>>> Update file inventory, fix metas
3833
- Assets/OneSignal/Documentation~/asset_listing.png
3934
- Assets/OneSignal/Documentation~/menu_import_package.png
4035
- Assets/OneSignal/Documentation~/menu_import_package.png.meta

‎OneSignalExample/Assets/OneSignal/VERSION

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
1-
<<<<<<< main
2-
<<<<<<< main
3-
2.14.6
4-
=======
5-
3.0.0-beta.1
6-
>>>>>>> Bumped version to 3.0.0-beta.1
7-
=======
8-
3.0.0-beta.2
9-
>>>>>>> Bumped version to 3.0.0-beta.2
1+
3.0.0-beta.2

‎OneSignalExample/ProjectSettings/ProjectSettings.asset

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,7 @@ PlayerSettings:
134134
16:10: 1
135135
16:9: 1
136136
Others: 1
137-
<<<<<<< main
138-
<<<<<<< main
139-
bundleVersion: 2.14.6
140-
=======
141-
bundleVersion: 3.0.0-beta.1
142-
>>>>>>> Bumped version to 3.0.0-beta.1
143-
=======
144137
bundleVersion: 3.0.0-beta.2
145-
>>>>>>> Bumped version to 3.0.0-beta.2
146138
preloadedAssets: []
147139
metroInputSource: 0
148140
wsaTransparentSwapchain: 0

‎com.onesignal.unity.android/package.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,11 @@
11
{
22
"name": "com.onesignal.unity.android",
33
"displayName": "OneSignal Unity SDK - Android",
4-
<<<<<<< main
5-
<<<<<<< main
6-
"version": "2.14.6",
7-
"unity": "2018.4",
8-
"description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
9-
"dependencies": {
10-
"com.onesignal.unity.core": "2.14.6"
11-
=======
12-
"version": "3.0.0-beta.1",
13-
"unity": "2018.4",
14-
"description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
15-
"dependencies": {
16-
"com.onesignal.unity.core": "3.0.0-beta.1"
17-
>>>>>>> Bumped version to 3.0.0-beta.1
18-
=======
194
"version": "3.0.0-beta.2",
205
"unity": "2018.4",
216
"description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
227
"dependencies": {
238
"com.onesignal.unity.core": "3.0.0-beta.2"
24-
>>>>>>> Bumped version to 3.0.0-beta.2
259
},
2610
"keywords": [
2711
"push-notifications",

‎com.onesignal.unity.core/Runtime/AssemblyInfo.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,5 @@
33
[assembly: InternalsVisibleTo("OneSignal.iOS")]
44
[assembly: InternalsVisibleTo("OneSignal.Android")]
55
[assembly: InternalsVisibleTo("OneSignal.Core.Editor")]
6-
<<<<<<< main
7-
[assembly: InternalsVisibleTo("OneSignal.UnityPackage.Attribution")]
8-
=======
96
[assembly: InternalsVisibleTo("OneSignal.UnityPackage.Example")]
10-
<<<<<<< main
11-
>>>>>>> WIP on example scene and behaviour
12-
=======
137
[assembly: InternalsVisibleTo("OneSignal.UnityPackage.Attribution")]
14-
>>>>>>> Updated VSP to only run from store plugin

‎com.onesignal.unity.core/package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
{
22
"name": "com.onesignal.unity.core",
33
"displayName": "OneSignal Unity SDK - Core",
4-
<<<<<<< main
5-
<<<<<<< main
6-
"version": "2.14.6",
7-
=======
8-
"version": "3.0.0-beta.1",
9-
>>>>>>> Bumped version to 3.0.0-beta.1
10-
=======
114
"version": "3.0.0-beta.2",
12-
>>>>>>> Bumped version to 3.0.0-beta.2
135
"unity": "2018.4",
146
"description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
157
"dependencies": {

‎com.onesignal.unity.ios/package.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,11 @@
11
{
22
"name": "com.onesignal.unity.ios",
33
"displayName": "OneSignal Unity SDK - iOS",
4-
<<<<<<< main
5-
<<<<<<< main
6-
"version": "2.14.6",
7-
"unity": "2018.4",
8-
"description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
9-
"dependencies": {
10-
"com.onesignal.unity.core": "2.14.6"
11-
=======
12-
"version": "3.0.0-beta.1",
13-
"unity": "2018.4",
14-
"description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
15-
"dependencies": {
16-
"com.onesignal.unity.core": "3.0.0-beta.1"
17-
>>>>>>> Bumped version to 3.0.0-beta.1
18-
=======
194
"version": "3.0.0-beta.2",
205
"unity": "2018.4",
216
"description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
227
"dependencies": {
238
"com.onesignal.unity.core": "3.0.0-beta.2"
24-
>>>>>>> Bumped version to 3.0.0-beta.2
259
},
2610
"keywords": [
2711
"push-notifications",

0 commit comments

Comments
 (0)