@@ -52,11 +52,7 @@ android {
 }
 
 dependencies {
-<<<<<<< Updated upstream
     implementation project(':utils')
-=======
-    implementation 'com.github.android:camera-samples:library-SNAPSHOT'
->>>>>>> Stashed changes
 
     // Kotlin lang
     implementation 'androidx.core:core-ktx:1.2.0'
 
@@ -40,7 +40,6 @@ allprojects {
         mavenLocal()
         google()
         jcenter()
-        maven { url 'https://jitpack.io' }
     }
 }
 
 
@@ -15,9 +15,6 @@
  */
 
 include 'app'
-<<<<<<< Updated upstream
 include ':utils'
 
 project(':utils').projectDir = new File('../CameraUtils/lib')
-=======
->>>>>>> Stashed changes
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ allprojects {`
`40`	`40`	`mavenLocal()`
`41`	`41`	`google()`
`42`	`42`	`jcenter()`
`43`		`- maven { url 'https://jitpack.io' }`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`